diff options
| -rw-r--r-- | lib/util/talloc_stack.c | 10 | ||||
| -rw-r--r-- | lib/util/talloc_stack.h | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/util/talloc_stack.c b/lib/util/talloc_stack.c index be332af571..9c72c80119 100644 --- a/lib/util/talloc_stack.c +++ b/lib/util/talloc_stack.c @@ -188,15 +188,19 @@ TALLOC_CTX *_talloc_stackframe_pool(const char *location, size_t poolsize) * Get us the current top of the talloc stack. */ -TALLOC_CTX *talloc_tos(void) +TALLOC_CTX *_talloc_tos(const char *location) { struct talloc_stackframe *ts = (struct talloc_stackframe *)SMB_THREAD_GET_TLS(global_ts); if (ts == NULL || ts->talloc_stacksize == 0) { - talloc_stackframe(); + _talloc_stackframe(location); ts = (struct talloc_stackframe *)SMB_THREAD_GET_TLS(global_ts); - DEBUG(0, ("no talloc stackframe around, leaking memory\n")); + DEBUG(0, ("no talloc stackframe at %s, leaking memory\n", + location)); +#ifdef DEVELOPER + smb_panic("No talloc stackframe"); +#endif } return ts->talloc_stack[ts->talloc_stacksize-1]; diff --git a/lib/util/talloc_stack.h b/lib/util/talloc_stack.h index 8e1644624b..2f5dcab0a3 100644 --- a/lib/util/talloc_stack.h +++ b/lib/util/talloc_stack.h @@ -53,7 +53,8 @@ TALLOC_CTX *_talloc_stackframe_pool(const char *location, size_t poolsize); * Get us the current top of the talloc stack. */ -TALLOC_CTX *talloc_tos(void); +#define talloc_tos() _talloc_tos(__location__) +TALLOC_CTX *_talloc_tos(const char *location); /* * return true if a talloc stackframe exists |