In the leak checker, don't assert when there are multiple identical
blocks in the lc_shadows array. Such a situation could arise from
incorrect use of VALGRIND_MALLOCLIKE_BLOCK, and has been observed to
cause assertion failures for some runs of Wine on Valgrind.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8144 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/mc_leakcheck.c b/memcheck/mc_leakcheck.c
index c838d3c..a8af9ff 100644
--- a/memcheck/mc_leakcheck.c
+++ b/memcheck/mc_leakcheck.c
@@ -694,10 +694,22 @@
tl_assert( lc_shadows[i]->data <= lc_shadows[i+1]->data);
}
- /* Sanity check -- make sure they don't overlap */
+ /* Sanity check -- make sure they don't overlap. But do allow
+ exact duplicates. If this assertion fails, it may mean that the
+ application has done something stupid with
+ VALGRIND_MALLOCLIKE_BLOCK client requests, specifically, has
+ made overlapping requests (which are nonsensical). Another way
+ to screw up is to use VALGRIND_MALLOCLIKE_BLOCK for stack
+ locations; again nonsensical. */
for (i = 0; i < lc_n_shadows-1; i++) {
- tl_assert( lc_shadows[i]->data + lc_shadows[i]->szB
- <= lc_shadows[i+1]->data );
+ tl_assert( /* normal case - no overlap */
+ (lc_shadows[i]->data + lc_shadows[i]->szB
+ <= lc_shadows[i+1]->data )
+ ||
+ /* degenerate case: exact duplicates */
+ (lc_shadows[i]->data == lc_shadows[i+1]->data
+ && lc_shadows[i]->szB == lc_shadows[i+1]->szB)
+ );
}
if (lc_n_shadows == 0) {