commit 60c2119ddd4de4e9dc296bc7b9da0d687f51cfa9
author Dmitry Volyntsev <xeioex@nginx.com> Sat Jun 11 00:15:30 2022 -0700
committer Dmitry Volyntsev <xeioex@nginx.com> Sat Jun 11 00:15:30 2022 -0700
tree ed1d1825f483ab9bbd5b5102b288e9c102ca9d11
parent 47ec0849bcba41814c83a8bf3b72076b3c6e0fbd

Catching invalid njs_mp_free() calls.

auto/options

diff --git a/auto/options b/auto/options
index 3590d22..5b6d638 100644
--- a/auto/options
+++ b/auto/options
@@ -62,3 +62,7 @@
     NJS_CONFIGURE_OPTIONS="$NJS_CONFIGURE_OPTIONS $njs_opt"
 
 done
+
+if [ "$NJS_DEBUG_MEMORY" = "YES" ]; then
+    NJS_DEBUG=YES
+fi

src/njs_assert.h

diff --git a/src/njs_assert.h b/src/njs_assert.h
index 55583ca..c4de79b 100644
--- a/src/njs_assert.h
+++ b/src/njs_assert.h
@@ -18,9 +18,19 @@
         }                                                                     \
     } while (0)
 
+#define njs_assert_msg(condition, fmt, ...)                                   \
+    do {                                                                      \
+        if (!(condition)) {                                                   \
+            njs_stderror(fmt, ##__VA_ARGS__);                                 \
+            njs_stderror(" at %s:%d\n", __FILE__, __LINE__);                  \
+            abort();                                                          \
+        }                                                                     \
+    } while (0)
+
 #else
 
 #define njs_assert(condition) (void) (condition)
+#define njs_assert_msg(condition, fmt, ...) (void) (condition)
 
 #endif
 

src/njs_mp.c

diff --git a/src/njs_mp.c b/src/njs_mp.c
index 5c7868d..27b2463 100644
--- a/src/njs_mp.c
+++ b/src/njs_mp.c
@@ -678,14 +678,12 @@
             return;
 
         } else {
-            err = "freed pointer points to middle of block: %p\n";
+            njs_assert_msg(0, "freed pointer points to middle of blk: %p\n", p);
         }
 
     } else {
-        err = "freed pointer is out of mp: %p\n";
+        njs_assert_msg(0, "freed pointer is out of mp: %p\n", p);
     }
-
-    njs_debug_alloc(err, p);
 }