merge from samba CVS: the buffer must be greater then src string len otherwise bad...

[netatalk.git] / libatalk / util / strlcpy.c

diff --git a/libatalk/util/strlcpy.c b/libatalk/util/strlcpy.c
index a0a59762bef73e393c8ca57ea15f8ed03b371ea4..314b039c3a37fc6076069766ff08bf570f742c7c 100644 (file)
--- a/libatalk/util/strlcpy.c
+++ b/libatalk/util/strlcpy.c
@@ -58,7 +58,10 @@
         size_t len1 = strlen(d);
         size_t len2 = strlen(s);
         size_t ret = len1 + len2;
- 
+
+       if (len1 >= bufsize) {
+               return 0;
+       } 
         if (len1+len2 >= bufsize) {
                 len2 = bufsize - (len1+1);
         }