The branch, v4-0-test has been updated
via e633dc4ec2d72c3d34b5e096e0460e07e07ab514 (commit)
from 91c899290f6962f277c103f11d5d8dc0a7c9aa02 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit e633dc4ec2d72c3d34b5e096e0460e07e07ab514
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Wed Jul 2 12:01:15 2008 -0700
Fix bug #5578, reported by [EMAIL PROTECTED] Bad (non-Samba) use of strlcat
gives error.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/lib/replace/replace.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
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
