hashtable: replaced by htable.

[ccan] / ccan / talloc / talloc.c

diff --git a/ccan/talloc/talloc.c b/ccan/talloc/talloc.c
index a5cd447e908b79cafc6709d860eac959715a9150..1b96f90fd08baf614dc6da16e3b2fd3e73071327 100644 (file)
--- a/ccan/talloc/talloc.c
+++ b/ccan/talloc/talloc.c
@@ -43,7 +43,7 @@
 #define ALWAYS_REALLOC 0
 
 
-#define MAX_TALLOC_SIZE 0x10000000
+#define MAX_TALLOC_SIZE 0x7FFFFFFF
 #define TALLOC_MAGIC 0xe814ec70
 #define TALLOC_FLAG_FREE 0x01
 #define TALLOC_FLAG_LOOP 0x02
@@ -789,6 +789,39 @@ void *_talloc(const void *context, size_t size)
        return __talloc(context, size);
 }
 
+static int talloc_destroy_pointer(void ***pptr)
+{
+       if ((uintptr_t)**pptr < getpagesize())
+               TALLOC_ABORT("Double free or invalid talloc_set?");
+       /* Invalidate pointer so it can't be used again. */
+       **pptr = (void *)1;
+       return 0;
+}
+
+void _talloc_set(void *ptr, const void *ctx, size_t size, const char *name)
+{
+       void ***child;
+       void *p;
+
+       p = talloc_named_const(ctx, size, name);
+       if (unlikely(!p))
+               goto set_ptr;
+
+       child = talloc(p, void **);
+       if (unlikely(!child)) {
+               talloc_free(p);
+               p = NULL;
+               goto set_ptr;
+       }
+       *child = ptr;
+       talloc_set_name_const(child, "talloc_set destructor");
+       talloc_set_destructor(child, talloc_destroy_pointer);
+
+set_ptr:
+       /* memcpy rather than cast avoids aliasing problems. */
+       memcpy(ptr, &p, sizeof(p));
+}
+
 /*
   externally callable talloc_set_name_const()
 */