diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/talloc.h | 6 | ||||
| -rw-r--r-- | source3/lib/talloc.c | 8 |
2 files changed, 1 insertions, 13 deletions
diff --git a/source3/include/talloc.h b/source3/include/talloc.h index a4df28c8b0c..89c2f82e056 100644 --- a/source3/include/talloc.h +++ b/source3/include/talloc.h @@ -21,12 +21,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef DEBUG_TALLOC -#define BAD_PTR (void*)0xdeadbeef -#else -#define BAD_PTR NULL -#endif - struct talloc_chunk { struct talloc_chunk *next; size_t size; diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c index 4c263ec4d61..85dd7b5b12d 100644 --- a/source3/lib/talloc.c +++ b/source3/lib/talloc.c @@ -55,13 +55,7 @@ void *talloc(TALLOC_CTX *t, size_t size) void *p; struct talloc_chunk *tc; - if (size == 0) { - /* debugging value used to track down - memory problems. BAD_PTR is defined - in talloc.h */ - p = BAD_PTR; - return p; - } + if (size == 0) return NULL; p = malloc(size); if (!p) return p; |