Bug #46042: backported the fix for the valgrind warning from 5.1

1a4bc9a1 · Georgi Kodinov · 7a91bf8c · 1a4bc9a1
Commit 1a4bc9a1 authored Jul 16, 2009 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

strings/strmake.c strings/strmake.c +3 -3

No files found.
--- a/strings/strmake.c
+++ b/strings/strmake.c
@@ -41,9 +41,9 @@ char *strmake(register char *dst, register const char *src, uint length)
    write a character rather than '\0' as this makes spotting these
    problems in the results easier.
  */
-  uint n= strlen(src) + 1;
+  uint n= 0;
-  if (n <= length)
+  while (n < length && src[n++]);
-    memset(dst + n, (int) 'Z', length - n + 1);
+  memset(dst + n, (int) 'Z', length - n + 1);
 #endif
  while (length--)