From 1fbc86c57a60fdb828a50d24c65750ba01b92f10 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 14 Jul 2009 11:56:33 +0200
Subject: talloc: call return after abort, because an overloaded abort function
 might not exit

This will be useful in the testsuite,
where we could check if an abort would happen.

metze
---
 lib/talloc/talloc.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/talloc')

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index a65a69b4e2..a0065bccab 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -180,12 +180,15 @@ static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr)
 	if (unlikely((tc->flags & (TALLOC_FLAG_FREE | ~0xF)) != TALLOC_MAGIC)) { 
 		if ((tc->flags & (~0xF)) == TALLOC_MAGIC_V1) {
 			talloc_abort_magic_v1();
+			return NULL;
 		}
 
 		if (tc->flags & TALLOC_FLAG_FREE) {
 			talloc_abort_double_free();
+			return NULL;
 		} else {
 			talloc_abort_unknown_value();
+			return NULL;
 		}
 	}
 	return tc;
@@ -595,6 +598,7 @@ static inline int _talloc_free_internal(void *ptr)
 
 		if (*pool_object_count == 0) {
 			talloc_abort("Pool object count zero!");
+			return 0;
 		}
 
 		*pool_object_count -= 1;
-- 
cgit