X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftalloc%2Ftalloc.c;h=1b96f90fd08baf614dc6da16e3b2fd3e73071327;hb=e81b19896fc782b5e9288b16a5311d4ff8ac4cec;hp=7a2dfab11bd1b7eb493f0ad437bef72b42ac4a97;hpb=ac0e87d7ecf790c187ce3c5d837b971fdd016b57;p=ccan

diff --git a/ccan/talloc/talloc.c b/ccan/talloc/talloc.c
index 7a2dfab1..1b96f90f 100644
--- 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
@@ -469,7 +469,7 @@ static void *__talloc_steal(const void *new_ctx, const void *ptr)
 /* 
    internal talloc_free call
 */
-static inline int _talloc_free(void *ptr)
+static inline int _talloc_free(const void *ptr)
 {
 	struct talloc_chunk *tc;
 	void *oldparent = NULL;
@@ -508,7 +508,7 @@ static inline int _talloc_free(void *ptr)
 			return -1;
 		}
 		tc->destructor = (talloc_destructor_t)-1;
-		if (d(ptr) == -1) {
+		if (d(discard_const_p(void, ptr)) == -1) {
 			tc->destructor = d;
 			return -1;
 		}
@@ -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()
 */