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

Jeremy.

diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index ea254b6047cdfb81d8158f5607f0f2d169aeac64..72ef9febe0ab290c9d82ed9e264cbee663c95b0b 100644 (file)
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -115,6 +115,9 @@ size_t 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) {

diff --git a/source/lib/replace/replace.c b/source/lib/replace/replace.c
index 2c3f14c2dfb8694a0cda2581dffe465a4eb2eac9..106c9dfe629d464003c20e54dcd38719f2e9f9af 100644 (file)
--- 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) {