From df4592458d004233b1ca86dc3b768a5b593696ea Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 10 Jan 2025 09:53:07 -0800 Subject: [PATCH 1/3] Set release date --- Changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 0440f87c..8502523c 100644 --- 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 From c46273f5715c2f961b896782491cca7ffceb9dfd Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 10 Jan 2025 09:53:25 -0800 Subject: [PATCH 2/3] Run clang-format --- src/data-pool.c | 8 ++++++-- t/data-pool-t.c | 4 +++- t/fuzz_mmdb.c | 12 +++++------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/data-pool.c b/src/data-pool.c index 1a9f9d03..fb91928b 100644 --- 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 index ff8907c0..6952c035 100644 --- 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 index 97332681..e9289431 100644 --- 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; From cba618d6581b7dbe83478c798d9e58faeaa6b582 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 10 Jan 2025 09:53:40 -0800 Subject: [PATCH 3/3] Bumped version to 1.12.2 --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b47093c..53955fb9 100644 --- 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/configure.ac b/configure.ac index 772391ae..dd06df1e 100644 --- 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], [support@maxmind.com]) +AC_INIT([libmaxminddb], [1.12.2], [support@maxmind.com]) AC_CONFIG_SRCDIR([include/maxminddb.h]) AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])