#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-#if !defined(NDEBUG)
#include <assert.h>
-#define TALLOC_ABORT(reason) do{ \
- fprintf(stderr, "%s: name: %s\n", __func__, tc->name); \
- assert(0 && reason);} while (0)
-#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#include <stdint.h>
#endif
+#include "log/log.h"
#include "talloc.h"
/* use this to force every realloc to change the pointer, to stress test
#define TALLOC_MAGIC_FREE 0x7faebef3
#define TALLOC_MAGIC_REFERENCE ((const char *)1)
-/* by default we abort when given a bad pointer (such as when talloc_free() is
- * called on a pointer that came from malloc() */
-#ifndef TALLOC_ABORT
-#define TALLOC_ABORT(reason) abort()
-#endif
-
#ifndef discard_const_p
#if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
# define discard_const_p(type, ptr) ((type *)((intptr_t)(ptr)))
struct talloc_chunk *tc = discard_const_p(struct talloc_chunk, ptr)-1;
if (tc->u.magic != TALLOC_MAGIC) {
if (tc->u.magic == TALLOC_MAGIC_FREE) {
- TALLOC_ABORT("Bad talloc magic value - double free");
+ pb_log_fn("Failed: Bad talloc magic value - double free, for name: %s\n",
+ tc->name);
+ fprintf(stderr, "%s: name: %s\n", __func__, tc->name);
+ fflush(stderr);
+ assert(0 && "Bad talloc magic value - double free");
} else {
- TALLOC_ABORT("Bad talloc magic value - unknown value");
+ pb_log_fn("Failed: Bad talloc magic value - unknown value\n");
+ assert(0 && "Bad talloc magic value - unknown value");
}
+ abort();
}
return tc;
/*
return the number of external references to a pointer
*/
-static int talloc_reference_count(const void *ptr)
+int talloc_reference_count(const void *ptr)
{
struct talloc_chunk *tc = talloc_chunk_from_ptr(ptr);
struct talloc_reference_handle *h;
len = vsnprintf(NULL, 0, fmt, ap2);
s = talloc_realloc(NULL, s, char, s_len + len+1);
- if (!s) return NULL;
+ if (!s)
+ goto out;
VA_COPY(ap2, ap);
vsnprintf(s+s_len, len+1, fmt, ap2);
talloc_set_name_const(s, s);
+out:
va_end(ap2);
return s;
}