From ad8e43155b9b9daf92156a13ddbafce31901b932 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com/bar.myoffice.izhnet.ru" <>
Date: Wed, 30 May 2007 14:03:35 +0500
Subject: [PATCH] Fixing wrong memory read problem detected by Valgrind in
 "xml" test. The source of the problem was in my_vsnprintf() implementation.

---
 strings/my_vsnprintf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index 93d228a1954..befdb1a81c2 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -95,8 +95,7 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
       reg2 char	*par = va_arg(ap, char *);
       uint plen,left_len = (uint)(end-to)+1;
       if (!par) par = (char*)"(null)";
-      plen = (uint) strlen(par);
-      set_if_smaller(plen,width);
+      plen= (uint) strnlen(par, width);
       if (left_len <= plen)
 	plen = left_len - 1;
       to=strnmov(to,par,plen);