From b92c9a1a81f3f68da87afe5887d8450fef0700d3 Mon Sep 17 00:00:00 2001
From: David Goldblatt <davidgoldblatt@fb.com>
Date: Wed, 20 Mar 2019 13:06:53 -0700
Subject: [PATCH] Safety checks: Indirect through a function.

This will let us share code on failure pathways.pathways
---
 Makefile.in                              |  1 +
 include/jemalloc/internal/safety_check.h |  6 ++++++
 src/safety_check.c                       | 11 +++++++++++
 src/tcache.c                             |  3 ++-
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 include/jemalloc/internal/safety_check.h
 create mode 100644 src/safety_check.c

diff --git a/Makefile.in b/Makefile.in
index 3a09442c..8b4a98fd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,6 +117,7 @@ C_SRCS := $(srcroot)src/jemalloc.c \
 	$(srcroot)src/prng.c \
 	$(srcroot)src/prof.c \
 	$(srcroot)src/rtree.c \
+	$(srcroot)src/safety_check.c \
 	$(srcroot)src/stats.c \
 	$(srcroot)src/sc.c \
 	$(srcroot)src/sz.c \
diff --git a/include/jemalloc/internal/safety_check.h b/include/jemalloc/internal/safety_check.h
new file mode 100644
index 00000000..52157d16
--- /dev/null
+++ b/include/jemalloc/internal/safety_check.h
@@ -0,0 +1,6 @@
+#ifndef JEMALLOC_INTERNAL_SAFETY_CHECK_H
+#define JEMALLOC_INTERNAL_SAFETY_CHECK_H
+
+void safety_check_fail(const char *format, ...);
+
+#endif /*JEMALLOC_INTERNAL_SAFETY_CHECK_H */
diff --git a/src/safety_check.c b/src/safety_check.c
new file mode 100644
index 00000000..cbec1907
--- /dev/null
+++ b/src/safety_check.c
@@ -0,0 +1,11 @@
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
+
+void safety_check_fail(const char *format, ...) {
+	va_list ap;
+
+	va_start(ap, format);
+	malloc_vcprintf(NULL, NULL, format, ap);
+	va_end(ap);
+	abort();
+}
diff --git a/src/tcache.c b/src/tcache.c
index 160b0b77..034c69a0 100644
--- a/src/tcache.c
+++ b/src/tcache.c
@@ -4,6 +4,7 @@
 
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/safety_check.h"
 #include "jemalloc/internal/sc.h"
 
 /******************************************************************************/
@@ -122,7 +123,7 @@ tbin_extents_lookup_size_check(tsdn_t *tsdn, cache_bin_t *tbin, szind_t binind,
 		sz_sum -= szind;
 	}
 	if (sz_sum != 0) {
-		malloc_printf("<jemalloc>: size mismatch in thread cache "
+		safety_check_fail("<jemalloc>: size mismatch in thread cache "
 		    "detected, likely caused by sized deallocation bugs by "
 		    "application. Abort.\n");
 		abort();