summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-05-12 06:43:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:53 -0500
commit121c115eceeaed478949c9d8d3bc6571b9b27547 (patch)
tree68519f4123f7f671da94579c830f144476aa5f4e /source3
parentde737187c931368950a4e0818c297a941e8d3781 (diff)
downloadsamba-121c115eceeaed478949c9d8d3bc6571b9b27547.tar.gz
samba-121c115eceeaed478949c9d8d3bc6571b9b27547.tar.bz2
samba-121c115eceeaed478949c9d8d3bc6571b9b27547.zip
r6743: Merge r6741 from 4_0
(This used to be commit fdfce3292aa84b70e220961540126ef4873aebea)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/talloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c
index 3650ab7f51..46abd89bac 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; }