Skip to content

Commit b2e9c37

Browse files
authored
Merge pull request #369 from maxmind/greg/eng-1020-libmaxminddb-1122-is-released
Release 1.12.2
2 parents 8d84eda + cba618d commit b2e9c37

File tree

6 files changed

+17
-13
lines changed

6 files changed

+17
-13
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.9...3.30)
22

33
project(maxminddb
44
LANGUAGES C
5-
VERSION 1.12.1
5+
VERSION 1.12.2
66
)
77
set(MAXMINDDB_SOVERSION 0.0.7)
88
set(CMAKE_C_STANDARD 99)

Changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.12.2
1+
## 1.12.2 - 2025-01-10
22

33
* `MMDB_get_entry_data_list()` now always sets the passed `entry_data_list`
44
parameter to either `NULL` or valid memory. This makes it safe for

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.63])
5-
AC_INIT([libmaxminddb], [1.12.1], [[email protected]])
5+
AC_INIT([libmaxminddb], [1.12.2], [[email protected]])
66
AC_CONFIG_SRCDIR([include/maxminddb.h])
77
AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])
88

src/data-pool.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,13 @@ int main(void) {
158158
}
159159

160160
static void test_can_multiply(void) {
161-
{ ok(can_multiply(SIZE_MAX, 1, SIZE_MAX), "1*SIZE_MAX is ok"); }
161+
{
162+
ok(can_multiply(SIZE_MAX, 1, SIZE_MAX), "1*SIZE_MAX is ok");
163+
}
162164

163-
{ ok(!can_multiply(SIZE_MAX, 2, SIZE_MAX), "2*SIZE_MAX is not ok"); }
165+
{
166+
ok(!can_multiply(SIZE_MAX, 2, SIZE_MAX), "2*SIZE_MAX is not ok");
167+
}
164168

165169
{
166170
ok(can_multiply(SIZE_MAX, 10240, sizeof(MMDB_entry_data_list_s)),

t/data-pool-t.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ static void test_data_pool_new(void) {
4343
}
4444

4545
static void test_data_pool_destroy(void) {
46-
{ data_pool_destroy(NULL); }
46+
{
47+
data_pool_destroy(NULL);
48+
}
4749

4850
{
4951
MMDB_data_pool_s *const pool = data_pool_new(512);

t/fuzz_mmdb.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77

88
extern int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
99

10-
int
11-
LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
12-
{
13-
int status;
14-
FILE *fp;
15-
MMDB_s mmdb;
16-
char filename[256];
10+
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
11+
int status;
12+
FILE *fp;
13+
MMDB_s mmdb;
14+
char filename[256];
1715

1816
if (size < kMinInputLength || size > kMaxInputLength)
1917
return 0;

0 commit comments

Comments
 (0)