[PATCH] klibc: strlcpy/strlcat - don't alter destination if size == 0

diff --git a/klibc/klibc/strlcat.c b/klibc/klibc/strlcat.c
index f397857e76362f3badc9763f14aa06ba3779a677..fdd72ac392c5b910f19c5e66ecc6227f1577e41a 100644 (file)
--- a/klibc/klibc/strlcat.c
+++ b/klibc/klibc/strlcat.c
@@ -26,7 +26,8 @@ size_t strlcat(char *dst, const char *src, size_t size)
     bytes++;
   }
 
-  *q = '\0';
+  if (size)
+    *q = '\0';
   return bytes;
 }
 

diff --git a/klibc/klibc/strlcpy.c b/klibc/klibc/strlcpy.c
index 8b36c43c00cc10e31810fd0a864b25131b370c99..9e7b6bf91fa692779bcc7b7517bc4471c6695e49 100644 (file)
--- a/klibc/klibc/strlcpy.c
+++ b/klibc/klibc/strlcpy.c
@@ -19,7 +19,8 @@ size_t strlcpy(char *dst, const char *src, size_t size)
     bytes++;
   }
 
-  *q = '\0';
+  if (size)
+    *q = '\0';
   return bytes;
 }
 

diff --git a/udev_libc_wrapper.c b/udev_libc_wrapper.c
index 23cb7b43168bc9ff7c3619bcf1440627f67f8b42..d69f2ac48e11dfb0dcc01daa6125089697307b93 100644 (file)
--- a/udev_libc_wrapper.c
+++ b/udev_libc_wrapper.c
@@ -58,7 +58,8 @@ size_t strlcpy(char *dst, const char *src, size_t size)
                bytes++;
        }
 
-       *q = '\0';
+       if (size)
+               *q = '\0';
        return bytes;
 }
 
@@ -82,7 +83,8 @@ size_t strlcat(char *dst, const char *src, size_t size)
                bytes++;
        }
 
-       *q = '\0';
+       if (size)
+               *q = '\0';
        return bytes;
 }
 #endif /* __OWN_STRLCPYCAT__ */