summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-11-20 09:58:09 +0100
committerKarolin Seeger <kseeger@samba.org>2015-03-15 22:14:08 +0100
commit243be7a5dd95cdb99baa87f7e9ec707b281f1114 (patch)
tree93170dfb37117327f21adffa37e6b674c8a88c16
parentf2396a6ee2adcb9ab68e91995cbe44dac7381cea (diff)
downloadsamba-243be7a5dd95cdb99baa87f7e9ec707b281f1114.tar.gz
talloc: fix compiler warning
This avoids the following warning when using: CFLAGS="-O3 -g -fstrict-overflow -Wstrict-overflow=5" ../talloc.c: In Funktion »talloc_is_parent«: ../talloc.c:2658:21: Warnung: assuming signed overflow does not occur when changing X +- C1 cmp C2 to X cmp C1 +- C2 [-Wstrict-overflow] Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit de822b58476093dc43c27577d2f7074541113cc5)
-rw-r--r--lib/talloc/talloc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index 3b8cb81df4a..fa56ea56780 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -2655,7 +2655,10 @@ static int _talloc_is_parent(const void *context, const void *ptr, int depth)
}
tc = talloc_chunk_from_ptr(context);
- while (tc && depth > 0) {
+ while (tc) {
+ if (depth <= 0) {
+ return 0;
+ }
if (TC_PTR_FROM_CHUNK(tc) == ptr) return 1;
while (tc && tc->prev) tc = tc->prev;
if (tc) {