From 7578b0e929f3380ba1713bd77a38c402a90f3b27 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Tue, 30 May 2017 13:17:10 -0700 Subject: [PATCH] Explicitly say so when aborting on opt_abort_conf. --- src/jemalloc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/jemalloc.c b/src/jemalloc.c index 5e3072b5..ed22a258 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -877,6 +877,14 @@ malloc_conf_next(char const **opts_p, char const **k_p, size_t *klen_p, return false; } +static void +malloc_abort_invalid_conf(void) { + assert(opt_abort_conf); + malloc_printf(": Abort (abort_conf:true) on invalid conf " + "value (see above).\n"); + abort(); +} + static void malloc_conf_error(const char *msg, const char *k, size_t klen, const char *v, size_t vlen) { @@ -884,7 +892,7 @@ malloc_conf_error(const char *msg, const char *k, size_t klen, const char *v, (int)vlen, v); had_conf_error = true; if (opt_abort_conf) { - abort(); + malloc_abort_invalid_conf(); } } @@ -1086,7 +1094,7 @@ malloc_conf_init(void) { CONF_HANDLE_BOOL(opt_abort, "abort") CONF_HANDLE_BOOL(opt_abort_conf, "abort_conf") if (opt_abort_conf && had_conf_error) { - abort(); + malloc_abort_invalid_conf(); } CONF_HANDLE_BOOL(opt_retain, "retain") if (strncmp("dss", k, klen) == 0) {