diff options
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/hooks.c | 52 | ||||
| -rw-r--r-- | malloc/malloc.c | 22 |
2 files changed, 69 insertions, 5 deletions
diff --git a/malloc/hooks.c b/malloc/hooks.c index cf6642c930..020657a368 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -106,7 +106,18 @@ __malloc_check_init() __realloc_hook = realloc_check; __memalign_hook = memalign_check; if(check_action & 1) - fprintf(stderr, "malloc: using debugging hooks\n"); + { +#ifdef _LIBC + _IO_flockfile (stderr); + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; +#endif + fprintf(stderr, "malloc: using debugging hooks\n"); +#ifdef _LIBC + ((_IO_FILE *) stderr)->_flags2 |= old_flags2; + _IO_funlockfile (stderr); +#endif + } } /* A simple, standard set of debugging hooks. Overhead is `only' one @@ -224,7 +235,18 @@ top_check() t == initial_top(&main_arena)) return 0; if(check_action & 1) - fprintf(stderr, "malloc: top chunk is corrupt\n"); + { +#ifdef _LIBC + _IO_flockfile (stderr); + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; +#endif + fprintf(stderr, "malloc: top chunk is corrupt\n"); +#ifdef _LIBC + ((_IO_FILE *) stderr)->_flags2 |= old_flags2; + _IO_funlockfile (stderr); +#endif + } if(check_action & 2) abort(); @@ -278,7 +300,18 @@ free_check(mem, caller) Void_t* mem; const Void_t *caller; if(!p) { (void)mutex_unlock(&main_arena.mutex); if(check_action & 1) - fprintf(stderr, "free(): invalid pointer %p!\n", mem); + { +#ifdef _LIBC + _IO_flockfile (stderr); + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; +#endif + fprintf(stderr, "free(): invalid pointer %p!\n", mem); +#ifdef _LIBC + ((_IO_FILE *) stderr)->_flags2 |= old_flags2; + _IO_funlockfile (stderr); +#endif + } if(check_action & 2) abort(); return; @@ -315,7 +348,18 @@ realloc_check(oldmem, bytes, caller) (void)mutex_unlock(&main_arena.mutex); if(!oldp) { if(check_action & 1) - fprintf(stderr, "realloc(): invalid pointer %p!\n", oldmem); + { +#ifdef _LIBC + _IO_flockfile (stderr); + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; +#endif + fprintf(stderr, "realloc(): invalid pointer %p!\n", oldmem); +#ifdef _LIBC + ((_IO_FILE *) stderr)->_flags2 |= old_flags2; + _IO_funlockfile (stderr); +#endif + } if(check_action & 2) abort(); return malloc_check(bytes, NULL); diff --git a/malloc/malloc.c b/malloc/malloc.c index 6b89083880..442f17e71a 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4139,7 +4139,18 @@ _int_free(mstate av, Void_t* mem) if (__builtin_expect ((uintptr_t) p > (uintptr_t) -size, 0)) { if (check_action & 1) - fprintf (stderr, "free(): invalid pointer %p!\n", mem); + { +#ifdef _LIBC + _IO_flockfile (stderr); + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; +#endif + fprintf (stderr, "free(): invalid pointer %p!\n", mem); +#ifdef _LIBC + ((_IO_FILE *) stderr)->_flags2 |= old_flags2; + _IO_funlockfile (stderr); +#endif + } if (check_action & 2) abort (); return; @@ -5108,6 +5119,11 @@ void mSTATs() if(__malloc_initialized < 0) ptmalloc_init (); +#ifdef _LIBC + _IO_flockfile (stderr); + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; +#endif for (i=0, ar_ptr = &main_arena;; i++) { (void)mutex_lock(&ar_ptr->mutex); mi = mALLINFo(ar_ptr); @@ -5152,6 +5168,10 @@ void mSTATs() fprintf(stderr, "locked total = %10ld\n", stat_lock_direct + stat_lock_loop + stat_lock_wait); #endif +#ifdef _LIBC + ((_IO_FILE *) stderr)->_flags2 |= old_flags2; + _IO_funlockfile (stderr); +#endif } |