The branch, v3-0-test has been updated
via 8c12b31481d7c1f8acdec006977c556337adb98f (commit)
from fdceef83eb5f8bd8546739c6642f78a790dcf207 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 8c12b31481d7c1f8acdec006977c556337adb98f
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Wed Jul 2 11:58:07 2008 -0700
Fix bug #5578, reported by [EMAIL PROTECTED] 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 8cd709b..fd62dec 100755
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -107,6 +107,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 db29913..43f7e86 100644
--- a/source/lib/replace/replace.c
+++ b/source/lib/replace/replace.c
@@ -84,6 +84,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
