From f27899402914065a6c1484ea8d81a2c8b70aa659 Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Sat, 28 Apr 2012 23:27:13 -0700
Subject: [PATCH] Fix more prof_tdata resurrection corner cases.

---
 include/jemalloc/internal/prof.h | 12 +++++++-----
 src/prof.c                       |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/jemalloc/internal/prof.h b/include/jemalloc/internal/prof.h
index b165e196..41a66923 100644
--- a/include/jemalloc/internal/prof.h
+++ b/include/jemalloc/internal/prof.h
@@ -235,8 +235,11 @@ bool	prof_boot2(void);
 	assert(size == s2u(size));					\
 									\
 	prof_tdata = prof_tdata_get();					\
-	if (prof_tdata == NULL) {					\
-		ret = NULL;						\
+	if ((uintptr_t)prof_tdata <= (uintptr_t)PROF_TDATA_STATE_MAX) {	\
+		if (prof_tdata != NULL)					\
+			ret = (prof_thr_cnt_t *)(uintptr_t)1U;		\
+		else							\
+			ret = NULL;					\
 		break;							\
 	}								\
 									\
@@ -308,8 +311,6 @@ prof_tdata_get(void)
 	if ((uintptr_t)prof_tdata <= (uintptr_t)PROF_TDATA_STATE_MAX) {
 		if (prof_tdata == NULL)
 			prof_tdata = prof_tdata_init();
-		else
-			prof_tdata = NULL;
 	}
 
 	return (prof_tdata);
@@ -394,7 +395,8 @@ prof_sample_accum_update(size_t size)
 	assert(opt_lg_prof_sample != 0);
 
 	prof_tdata = *prof_tdata_tsd_get();
-	assert((uintptr_t)prof_tdata > (uintptr_t)PROF_TDATA_STATE_MAX);
+	if ((uintptr_t)prof_tdata <= (uintptr_t)PROF_TDATA_STATE_MAX)
+		return (true);
 
 	/* Take care to avoid integer overflow. */
 	if (size >= prof_tdata->threshold - prof_tdata->accum) {
diff --git a/src/prof.c b/src/prof.c
index e3549662..de1d3929 100644
--- a/src/prof.c
+++ b/src/prof.c
@@ -440,7 +440,7 @@ prof_lookup(prof_bt_t *bt)
 	cassert(config_prof);
 
 	prof_tdata = prof_tdata_get();
-	if (prof_tdata == NULL)
+	if ((uintptr_t)prof_tdata <= (uintptr_t)PROF_TDATA_STATE_MAX)
 		return (NULL);
 
 	if (ckh_search(&prof_tdata->bt2cnt, bt, NULL, &ret.v)) {
@@ -846,7 +846,7 @@ prof_dump(bool propagate_err, const char *filename, bool leakcheck)
 	cassert(config_prof);
 
 	prof_tdata = prof_tdata_get();
-	if (prof_tdata == NULL)
+	if ((uintptr_t)prof_tdata <= (uintptr_t)PROF_TDATA_STATE_MAX)
 		return (true);
 	prof_enter(prof_tdata);
 	prof_dump_fd = creat(filename, 0644);