diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 696386952f7..12562c88c93 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-09-16 Andreas Schwab <schwab@suse.de> + + * alloc.c (reset_malloc_hooks): Set the hooks to the previous + values instead of zapping them. + 2007-09-14 Glenn Morris <rgm@gnu.org> * fringe.c (init_fringe_bitmap) <swap_nibble>: Move to file scope. diff --git a/src/alloc.c b/src/alloc.c index 8aea81a0f72..f1758158344 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1343,9 +1343,9 @@ emacs_blocked_realloc (ptr, size, ptr2) void reset_malloc_hooks () { - __free_hook = 0; - __malloc_hook = 0; - __realloc_hook = 0; + __free_hook = old_free_hook; + __malloc_hook = old_malloc_hook; + __realloc_hook = old_realloc_hook; } #endif /* HAVE_GTK_AND_PTHREAD */ |