1 files changed, 13 insertions, 0 deletions
diff --git a/src/hlr.c b/src/hlr.c
index 6c0cb0a..8732587 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -551,6 +551,9 @@ int main(int argc, char **argv)
 {
 	int rc;
 
+	/* Track the use of talloc NULL memory contexts */
+	talloc_enable_null_tracking();
+
 	hlr_ctx = talloc_named_const(NULL, 1, "OsmoHLR");
 	msgb_talloc_ctx_init(hlr_ctx, 0);
 	vty_info.tall_ctx = hlr_ctx;
@@ -632,5 +635,15 @@ int main(int argc, char **argv)
 	talloc_report_full(hlr_ctx, stderr);
 	talloc_free(hlr_ctx);
 
+	/* FIXME: VTY code still uses NULL-context */
+	talloc_free(tall_vty_ctx);
+
+	/**
+	 * Report the heap state of NULL context, then free,
+	 * so both ASAN and Valgrind are happy...
+	 */
+	talloc_report_full(NULL, stderr);
+	talloc_disable_null_tracking();
+
 	return 0;
 }