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

Fix realloc wrappers to handle the out of memory case properly - if

Browse Source 
the call to VG_(cli_malloc) returns NULL then don't try and copy the
data or register a new block and just leave the old block in place
instead, but still return NULL to the caller.

Fixes bug 109487 and it's duplicates.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4875
This commit is contained in:
Tom Hughes 2005-10-06 09:00:17 +00:00
parent 85545d1a1c
commit daf507dee2
3 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
helgrind/hg_main.c
View File

@ -1977,7 +1977,6 @@ static void* hg_realloc ( ThreadId tid, void* p, SizeT new_size )
{
HG_Chunk *hc;
HG_Chunk **prev_chunks_next_ptr;
Int i;
/* First try and find the block. */
hc = (HG_Chunk*)VG_(HT_get_node) ( hg_malloc_list, (UWord)p,
@ -2005,22 +2004,23 @@ static void* hg_realloc ( ThreadId tid, void* p, SizeT new_size )
/* Get new memory */
p_new = (Addr)VG_(cli_malloc)(VG_(clo_alignment), new_size);
/* First half kept and copied, second half new */
copy_address_range_state( (Addr)p, p_new, hc->size );
hg_new_mem_heap ( p_new+hc->size, new_size-hc->size,
/*inited*/False );
if (p_new) {
/* First half kept and copied, second half new */
copy_address_range_state( (Addr)p, p_new, hc->size );
hg_new_mem_heap ( p_new+hc->size, new_size-hc->size,
/*inited*/False );
/* Copy from old to new */
for (i = 0; i < hc->size; i++)
((UChar*)p_new)[i] = ((UChar*)p)[i];
/* Copy from old to new */
VG_(memcpy)((void *)p_new, p, hc->size);
/* Free old memory */
die_and_free_mem ( tid, hc, prev_chunks_next_ptr );
/* Free old memory */
die_and_free_mem ( tid, hc, prev_chunks_next_ptr );
/* this has to be after die_and_free_mem, otherwise the
former succeeds in shorting out the new block, not the
old, in the case when both are on the same list. */
add_HG_Chunk ( tid, p_new, new_size );
/* this has to be after die_and_free_mem, otherwise the
former succeeds in shorting out the new block, not the
old, in the case when both are on the same list. */
add_HG_Chunk ( tid, p_new, new_size );
}
return (void*)p_new;
}

30
massif/ms_main.c
View File

@ -802,22 +802,26 @@ static void* ms_realloc ( ThreadId tid, void* p_old, SizeT new_size )
} else {
// new size is bigger; make new block, copy shared contents, free old
p_new = VG_(cli_malloc)(VG_(clo_alignment), new_size);
VG_(memcpy)(p_new, p_old, old_size);
VG_(cli_free)(p_old);
if (p_new) {
VG_(memcpy)(p_new, p_old, old_size);
VG_(cli_free)(p_old);
}
}
old_where = hc->where;
new_where = get_XCon( tid, /*custom_malloc*/False);
// Update HP_Chunk
hc->data = (Addr)p_new;
hc->size = new_size;
hc->where = new_where;
if (p_new) {
old_where = hc->where;
new_where = get_XCon( tid, /*custom_malloc*/False);
// Update XPt curr_space fields
if (clo_heap) {
if (0 != old_size) update_XCon(old_where, -old_size);
if (0 != new_size) update_XCon(new_where, new_size);
// Update HP_Chunk
hc->data = (Addr)p_new;
hc->size = new_size;
hc->where = new_where;
// Update XPt curr_space fields
if (clo_heap) {
if (0 != old_size) update_XCon(old_where, -old_size);
if (0 != new_size) update_XCon(new_where, new_size);
}
}
// Now insert the new hc (with a possibly new 'data' field) into

31
memcheck/mac_malloc_wrappers.c
View File

@ -390,23 +390,26 @@ void* MAC_(realloc) ( ThreadId tid, void* p_old, SizeT new_size )
/* Get new memory */
Addr a_new = (Addr)VG_(cli_malloc)(VG_(clo_alignment), new_size);
/* First half kept and copied, second half new, red zones as normal */
MAC_(ban_mem_heap) ( a_new-MAC_MALLOC_REDZONE_SZB, MAC_MALLOC_REDZONE_SZB );
MAC_(copy_mem_heap)( (Addr)p_old, a_new, mc->size );
MAC_(new_mem_heap) ( a_new+mc->size, new_size-mc->size, /*init'd*/False );
MAC_(ban_mem_heap) ( a_new+new_size, MAC_MALLOC_REDZONE_SZB );
if (a_new) {
/* First half kept and copied, second half new, red zones as normal */
MAC_(ban_mem_heap) ( a_new-MAC_MALLOC_REDZONE_SZB, MAC_MALLOC_REDZONE_SZB );
MAC_(copy_mem_heap)( (Addr)p_old, a_new, mc->size );
MAC_(new_mem_heap) ( a_new+mc->size, new_size-mc->size, /*init'd*/False );
MAC_(ban_mem_heap) ( a_new+new_size, MAC_MALLOC_REDZONE_SZB );
/* Copy from old to new */
VG_(memcpy)((void*)a_new, p_old, mc->size);
/* Copy from old to new */
VG_(memcpy)((void*)a_new, p_old, mc->size);
/* Free old memory */
/* Nb: we have to allocate a new MAC_Chunk for the new memory rather
than recycling the old one, so that any erroneous accesses to the
old memory are reported. */
die_and_free_mem ( tid, mc, MAC_MALLOC_REDZONE_SZB );
/* Free old memory */
/* Nb: we have to allocate a new MAC_Chunk for the new memory rather
than recycling the old one, so that any erroneous accesses to the
old memory are reported. */
die_and_free_mem ( tid, mc, MAC_MALLOC_REDZONE_SZB );
// Allocate a new chunk.
mc = create_MAC_Chunk( tid, a_new, new_size, MAC_AllocMalloc );
}
// Allocate a new chunk.
mc = create_MAC_Chunk( tid, a_new, new_size, MAC_AllocMalloc );
p_new = (void*)a_new;
}