summaryrefslogtreecommitdiffstats
path: root/source/lib/talloc.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-05-12 06:43:12 +0000
committerVolker Lendecke <vlendec@samba.org>2005-05-12 06:43:12 +0000
commitc62275f3cee40ee0b73cc81c81ca14c5544d5d60 (patch)
treecd38a06b6469ea4ec4426a5e1bc073ba30f7a8e0 /source/lib/talloc.c
parent7bd01ce16d9ca922dc6f358e1db3248afd6e636a (diff)
downloadsamba-c62275f3cee40ee0b73cc81c81ca14c5544d5d60.tar.gz
samba-c62275f3cee40ee0b73cc81c81ca14c5544d5d60.tar.xz
samba-c62275f3cee40ee0b73cc81c81ca14c5544d5d60.zip
r6743: Merge r6741 from 4_0
Diffstat (limited to 'source/lib/talloc.c')
-rw-r--r--source/lib/talloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/lib/talloc.c b/source/lib/talloc.c
index 3650ab7f51b..46abd89bac5 100644
--- a/source/lib/talloc.c
+++ b/source/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; }