From 121c115eceeaed478949c9d8d3bc6571b9b27547 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Thu, 12 May 2005 06:43:12 +0000
Subject: [PATCH] r6743: Merge r6741 from 4_0 (This used to be commit
 fdfce3292aa84b70e220961540126ef4873aebea)

---
 source3/lib/talloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c
index 3650ab7f51b..46abd89bac5 100644
--- a/source3/lib/talloc.c
+++ b/source3/lib/talloc.c
@@ -919,7 +919,7 @@ char *talloc_strndup(const void *t, const char *p, size_t n)
 	size_t len;
 	char *ret;
 
-	for (len=0; p[len] && len<n; len++) ;
+	for (len=0; len<n && p[len]; len++) ;
 
 	ret = _talloc(t, len + 1);
 	if (!ret) { return NULL; }
-- 
2.11.4.GIT