[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2675-ga93c7a2

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  a93c7a2170124f24aac4063c853475ae3f6b0720 (commit)
      from  00e48ea5d113a0bde1a2b044d6869174cb536035 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit a93c7a2170124f24aac4063c853475ae3f6b0720
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jul 2 11:57:59 2008 -0700

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

-----------------------------------------------------------------------

Summary of changes:
 source/client/mount.cifs.c   |    3 +++
 source/lib/replace/replace.c |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index c42375b..c24c22e 100644
--- 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 2c3f14c..106c9df 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) {


-- 
Samba Shared Repository