From 1a4bc9a1e429697f86f63f2599e49a4f2d29cd32 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Thu, 16 Jul 2009 16:13:26 +0300 Subject: [PATCH] Bug #46042: backported the fix for the valgrind warning from 5.1 --- strings/strmake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strings/strmake.c b/strings/strmake.c index 05b5878d99c..acc220bbf1c 100644 --- 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; - if (n <= length) - memset(dst + n, (int) 'Z', length - n + 1); + uint n= 0; + while (n < length && src[n++]); + memset(dst + n, (int) 'Z', length - n + 1); #endif while (length--)