zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-04 02:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DRD: Fixed an assertion failure triggered by setting the environment variable DRD_VERIFY_CONFLICT_SET. This environment variable is a debugging help.

Browse Source 
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11632
This commit is contained in:
Bart Van Assche 2011-03-12 12:37:46 +00:00
parent 1997767aad
commit 73c5a1b3a3
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drd/drd_bitmap2_node.c
View File

@ -154,24 +154,22 @@ void DRD_(bm2_free_node)(void* const bm2)
{
struct block_allocator_chunk* p;
tl_assert(s_bm2_node_size > 0);
tl_assert(bm2);
for (p = s_first; p; p = p->next)
{
if (p->data <= bm2 && bm2 < p->data_end)
{
/* Free the memory that was allocated for a non-root AVL tree node. */
tl_assert(((char*)bm2 - (char*)(p->data)) % s_bm2_node_size == 0);
*(void**)bm2 = p->first_free;
p->first_free = bm2;
tl_assert(p->nallocated >= 1);
if (--(p->nallocated) == 0)
free_chunk(p);
return;
if (s_bm2_node_size > 0) {
for (p = s_first; p; p = p->next) {
if (p->data <= bm2 && bm2 < p->data_end) {
/* Free a non-root AVL tree node. */
tl_assert(((char*)bm2 - (char*)(p->data)) % s_bm2_node_size == 0);
*(void**)bm2 = p->first_free;
p->first_free = bm2;
tl_assert(p->nallocated >= 1);
if (--(p->nallocated) == 0)
free_chunk(p);
return;
}
}
}
/* Free the memory that was allocated for an AVL tree root node. */
VG_(free)(bm2);
}