Be more careful about overflows

maxmind · Jan 9, 2024 · 5fd2c21 · 5fd2c21
1 parent 0602d2e
commit 5fd2c21
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/maxminddb.c b/src/maxminddb.c
@@ -301,7 +301,8 @@ int MMDB_open(const char *const filename, uint32_t flags, MMDB_s *const mmdb) {
 
     mmdb->data_section =
         mmdb->file_content + search_tree_size + MMDB_DATA_SECTION_SEPARATOR;
-    if (search_tree_size + MMDB_DATA_SECTION_SEPARATOR > mmdb->file_size) {
+    if (mmdb->file_size < MMDB_DATA_SECTION_SEPARATOR ||
+        search_tree_size > mmdb->file_size - MMDB_DATA_SECTION_SEPARATOR) {
         status = MMDB_INVALID_METADATA_ERROR;
         goto cleanup;
     }