From: Jeremy Allison <jra@samba.org>
Date: Wed, 2 Jul 2008 19:01:15 +0000 (-0700)
Subject: Fix bug #5578, reported by sendel2000@hotbox.ru. Bad (non-Samba) use of strlcat gives... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e633dc4ec2d72c3d34b5e096e0460e07e07ab514;p=thirdparty%2Fsamba.git

Fix bug #5578, reported by sendel2000@hotbox.ru. Bad (non-Samba) use of strlcat gives error.
Jeremy.
---

diff --git a/source/lib/replace/replace.c b/source/lib/replace/replace.c
index 2c3f14c2dfb..106c9dfe629 100644
--- a/source/lib/replace/replace.c
+++ b/source/lib/replace/replace.c
@@ -82,6 +82,9 @@ size_t rep_strlcat(char *d, const char *s, size_t bufsize)
 	size_t ret = len1 + len2;
 
 	if (len1+len2 >= bufsize) {
+		if (bufsize < (len1+1)) {
+			return ret;
+		}
 		len2 = bufsize - (len1+1);
 	}
 	if (len2 > 0) {