Fix a Valgrind regression in chunk_alloc_wrapper().

ronawho · jasone · commit c7d52980275b · 2016-06-07T14:30:39.000-07:00
This regression was caused by d412624 (Move retaining out of default chunk hooks).
diff --git a/src/chunk.c b/src/chunk.c
@@ -493,10 +493,12 @@ chunk_alloc_wrapper(tsdn_t *tsdn, arena_t *arena, chunk_hooks_t *chunk_hooks,
 
 		if (ret == NULL)
 			return (NULL);
+
+		if (config_valgrind && chunk_hooks->alloc !=
+		    chunk_alloc_default)
+			JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(ret, chunksize);
 	}
 
-	if (config_valgrind && chunk_hooks->alloc != chunk_alloc_default)
-		JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(ret, chunksize);
 	return (ret);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -493,10 +493,12 @@ chunk_alloc_wrapper(tsdn_t tsdn, arena_t arena, chunk_hooks_t *chunk_hooks,`
`493`	`493`
`494`	`494`	`if (ret == NULL)`
`495`	`495`	`return (NULL);`
	`496`	`+`
	`497`	`+ if (config_valgrind && chunk_hooks->alloc !=`
	`498`	`+ chunk_alloc_default)`
	`499`	`+ JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(ret, chunksize);`
`496`	`500`	`}`
`497`	`501`
`498`		`- if (config_valgrind && chunk_hooks->alloc != chunk_alloc_default)`
`499`		`- JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(ret, chunksize);`
`500`	`502`	`return (ret);`
`501`	`503`	`}`
`502`	`504`