diff options
| author | James E Wilson <wilson@specifixinc.com> | 2005-08-18 13:01:54 -0700 |
|---|---|---|
| committer | Jim Wilson <wilson@gcc.gnu.org> | 2005-08-18 13:01:54 -0700 |
| commit | 2483ad581a25b4e7aad16c11fce6757b6af36d8c (patch) | |
| tree | e892f1756c7f014246b880abc4d6a071e49ab659 /libmudflap/mf-hooks1.c | |
| parent | 9ed8fb9bbc80c980055f9520237c7ab99ac2e660 (diff) | |
| download | gcc-2483ad581a25b4e7aad16c11fce6757b6af36d8c.zip gcc-2483ad581a25b4e7aad16c11fce6757b6af36d8c.tar.gz gcc-2483ad581a25b4e7aad16c11fce6757b6af36d8c.tar.bz2 | |
Fix FreeBSD failure with recursive malloc call.
* mf-hooks1.c (malloc, calloc, realloc, free,
__mf_wrap_alloca_indirect): Call BEGIN_MALLOC_PROTECT before calling
the real routines, and END_MALLOC_PROTECT afterwards.
* mf-impl.h (enum __mf_state_enum): Expand comment. Add in_malloc.
(BEGIN_PROTECT): Handle in_malloc state.
(BEGIN_MALLOC_PROTECT, END_MALLOC_PROTECT): New.
* testsuite/libmudflap.c/hook2-allocstuff.c: New.
From-SVN: r103256
Diffstat (limited to 'libmudflap/mf-hooks1.c')
| -rw-r--r-- | libmudflap/mf-hooks1.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libmudflap/mf-hooks1.c b/libmudflap/mf-hooks1.c index 0700d9a..a99d772 100644 --- a/libmudflap/mf-hooks1.c +++ b/libmudflap/mf-hooks1.c @@ -108,7 +108,9 @@ WRAPPER(void *, malloc, size_t c) size_with_crumple_zones = CLAMPADD(c,CLAMPADD(__mf_opts.crumple_zone, __mf_opts.crumple_zone)); + BEGIN_MALLOC_PROTECT (); result = (char *) CALL_REAL (malloc, size_with_crumple_zones); + END_MALLOC_PROTECT (); if (LIKELY(result)) { @@ -145,7 +147,9 @@ WRAPPER(void *, calloc, size_t c, size_t n) CLAMPADD((c * n), /* XXX: CLAMPMUL */ CLAMPADD(__mf_opts.crumple_zone, __mf_opts.crumple_zone)); + BEGIN_MALLOC_PROTECT (); result = (char *) CALL_REAL (malloc, size_with_crumple_zones); + END_MALLOC_PROTECT (); if (LIKELY(result)) memset (result, 0, size_with_crumple_zones); @@ -187,7 +191,9 @@ WRAPPER(void *, realloc, void *buf, size_t c) size_with_crumple_zones = CLAMPADD(c, CLAMPADD(__mf_opts.crumple_zone, __mf_opts.crumple_zone)); + BEGIN_MALLOC_PROTECT (); result = (char *) CALL_REAL (realloc, base, size_with_crumple_zones); + END_MALLOC_PROTECT (); /* Ensure heap wiping doesn't occur during this peculiar unregister/reregister pair. */ @@ -272,7 +278,9 @@ WRAPPER(void, free, void *buf) (void *) freeme, __mf_opts.crumple_zone); } + BEGIN_MALLOC_PROTECT (); CALL_REAL (free, freeme); + END_MALLOC_PROTECT (); } } else @@ -287,7 +295,9 @@ WRAPPER(void, free, void *buf) (void *) buf, __mf_opts.crumple_zone); } + BEGIN_MALLOC_PROTECT (); CALL_REAL (free, base); + END_MALLOC_PROTECT (); } } @@ -420,8 +430,10 @@ __mf_wrap_alloca_indirect (size_t c) { struct alloca_tracking *next = alloca_history->next; __mf_unregister (alloca_history->ptr, 0, __MF_TYPE_HEAP); + BEGIN_MALLOC_PROTECT (); CALL_REAL (free, alloca_history->ptr); CALL_REAL (free, alloca_history); + END_MALLOC_PROTECT (); alloca_history = next; } @@ -429,14 +441,20 @@ __mf_wrap_alloca_indirect (size_t c) result = NULL; if (LIKELY (c > 0)) /* alloca(0) causes no allocation. */ { + BEGIN_MALLOC_PROTECT (); track = (struct alloca_tracking *) CALL_REAL (malloc, sizeof (struct alloca_tracking)); + END_MALLOC_PROTECT (); if (LIKELY (track != NULL)) { + BEGIN_MALLOC_PROTECT (); result = CALL_REAL (malloc, c); + END_MALLOC_PROTECT (); if (UNLIKELY (result == NULL)) { + BEGIN_MALLOC_PROTECT (); CALL_REAL (free, track); + END_MALLOC_PROTECT (); /* Too bad. XXX: What about errno? */ } else |