diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-08-22 12:44:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:11 -0500 |
| commit | ddbe971030070ab1b9fc37b8b0ac44a3d9303fe4 (patch) | |
| tree | aeee59035c5f4df7145861e7668a7f61bfbc49bc /source/lib/talloc | |
| parent | 102bb0fc17d6dec102d628f1051675a1ae5a9c27 (diff) | |
| download | samba-ddbe971030070ab1b9fc37b8b0ac44a3d9303fe4.tar.gz samba-ddbe971030070ab1b9fc37b8b0ac44a3d9303fe4.tar.xz samba-ddbe971030070ab1b9fc37b8b0ac44a3d9303fe4.zip | |
r24627: merge from SAMBA_4_0:
as TALLOC_ABORT() is defined to abort() by default
wrap it into a function so that the function name
in the backtrace shows what happens.
metze
Diffstat (limited to 'source/lib/talloc')
| -rw-r--r-- | source/lib/talloc/talloc.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source/lib/talloc/talloc.c b/source/lib/talloc/talloc.c index 6ebdada42f8..c073a8c7743 100644 --- a/source/lib/talloc/talloc.c +++ b/source/lib/talloc/talloc.c @@ -115,6 +115,16 @@ struct talloc_chunk { #define TC_HDR_SIZE ((sizeof(struct talloc_chunk)+15)&~15) #define TC_PTR_FROM_CHUNK(tc) ((void *)(TC_HDR_SIZE + (char*)tc)) +static void talloc_abort_double_free(void) +{ + TALLOC_ABORT("Bad talloc magic value - double free"); +} + +static void talloc_abort_unknown_value(void) +{ + TALLOC_ABORT("Bad talloc magic value - unknown value"); +} + /* panic if we get a bad magic value */ static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr) { @@ -122,9 +132,9 @@ static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr) struct talloc_chunk *tc = discard_const_p(struct talloc_chunk, pp - TC_HDR_SIZE); if (unlikely((tc->flags & (TALLOC_FLAG_FREE | ~0xF)) != TALLOC_MAGIC)) { if (tc->flags & TALLOC_FLAG_FREE) { - TALLOC_ABORT("Bad talloc magic value - double free"); + talloc_abort_double_free(); } else { - TALLOC_ABORT("Bad talloc magic value - unknown value"); + talloc_abort_unknown_value(); } } return tc; |