Merge pull request #178 from maxmind/greg/eng-1019

Check MMDB_get_metadata_as_entry_data_list return value

Author: horgh

.github/workflows/clang-addresssanitizer.yml

@@ -6,6 +6,8 @@ on:
   schedule:
     - cron: '53 3 * * SUN'
 
+permissions: {}
+
 jobs:
   addresssanitizer:
     name: Clang AddressSanitizer

.github/workflows/clang-analyzer.yml

@@ -6,6 +6,8 @@ on:
   schedule:
     - cron: '45 3 * * SUN'
 
+permissions: {}
+
 jobs:
   run:
     name: "Clang Static Analysis"

.github/workflows/lint.yml

@@ -6,6 +6,8 @@ on:
   schedule:
     - cron: '45 3 * * SUN'
 
+permissions: {}
+
 jobs:
   run:
     runs-on: ubuntu-latest

.github/workflows/test.yml

@@ -6,6 +6,8 @@ on:
   schedule:
     - cron: '45 3 * * SUN'
 
+permissions: {}
+
 jobs:
   run:
     runs-on: ${{ matrix.operating-system }}

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.12.1
+-------------------
+
+* The C extension now checks that the database metadata lookup was
+  successful.
+
 1.12.0 (2024-11-14)
 -------------------
 

ext/maxminddb.c

@@ -336,7 +336,15 @@ PHP_METHOD(MaxMind_Db_Reader, metadata) {
     object_init_ex(return_value, metadata_ce);
 
     MMDB_entry_data_list_s *entry_data_list;
-    MMDB_get_metadata_as_entry_data_list(mmdb_obj->mmdb, &entry_data_list);
+    int status =
+        MMDB_get_metadata_as_entry_data_list(mmdb_obj->mmdb, &entry_data_list);
+    if (status != MMDB_SUCCESS) {
+        zend_throw_exception_ex(maxminddb_exception_ce,
+                                0 TSRMLS_CC,
+                                "Error while decoding metadata. %s",
+                                MMDB_strerror(status));
+        return;
+    }
 
     zval metadata_array;
     const MMDB_entry_data_list_s *rv =