Merge pull request #369 from maxmind/greg/eng-1020-libmaxminddb-1122-…

…is-released Release 1.12.2
maxmind · Jan 10, 2025 · b2e9c37 · b2e9c37
2 parents 8d84eda + cba618d
commit b2e9c37
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.9...3.30)
 
 project(maxminddb
   LANGUAGES C
-  VERSION 1.12.1
+  VERSION 1.12.2
 )
 set(MAXMINDDB_SOVERSION 0.0.7)
 set(CMAKE_C_STANDARD 99)

diff --git a/Changes.md b/Changes.md
@@ -1,4 +1,4 @@
-## 1.12.2
+## 1.12.2 - 2025-01-10
 
 * `MMDB_get_entry_data_list()` now always sets the passed `entry_data_list`
   parameter to either `NULL` or valid memory. This makes it safe for

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([libmaxminddb], [1.12.1], [[email protected]])
+AC_INIT([libmaxminddb], [1.12.2], [[email protected]])
 AC_CONFIG_SRCDIR([include/maxminddb.h])
 AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])
 

diff --git a/src/data-pool.c b/src/data-pool.c
@@ -158,9 +158,13 @@ int main(void) {
 }
 
 static void test_can_multiply(void) {
-    { ok(can_multiply(SIZE_MAX, 1, SIZE_MAX), "1*SIZE_MAX is ok"); }
+    {
+        ok(can_multiply(SIZE_MAX, 1, SIZE_MAX), "1*SIZE_MAX is ok");
+    }
 
-    { ok(!can_multiply(SIZE_MAX, 2, SIZE_MAX), "2*SIZE_MAX is not ok"); }
+    {
+        ok(!can_multiply(SIZE_MAX, 2, SIZE_MAX), "2*SIZE_MAX is not ok");
+    }
 
     {
         ok(can_multiply(SIZE_MAX, 10240, sizeof(MMDB_entry_data_list_s)),

diff --git a/t/data-pool-t.c b/t/data-pool-t.c
@@ -43,7 +43,9 @@ static void test_data_pool_new(void) {
 }
 
 static void test_data_pool_destroy(void) {
-    { data_pool_destroy(NULL); }
+    {
+        data_pool_destroy(NULL);
+    }
 
     {
         MMDB_data_pool_s *const pool = data_pool_new(512);

diff --git a/t/fuzz_mmdb.c b/t/fuzz_mmdb.c
@@ -7,13 +7,11 @@
 
 extern int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 
-int
-LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
-{
-    int     status;
-    FILE    *fp;
-    MMDB_s  mmdb;
-    char    filename[256];
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+    int status;
+    FILE *fp;
+    MMDB_s mmdb;
+    char filename[256];
 
     if (size < kMinInputLength || size > kMaxInputLength)
         return 0;