From 0f63c3d39c51d2749bd13c54e68bd48cc04fa300 Mon Sep 17 00:00:00 2001 From: "cmiller@zippy.(none)" <> Date: Tue, 2 May 2006 13:42:35 -0400 Subject: [PATCH] An update to as-yet unused new feature of snprintf, which was added to bring our sprintf()-alike in sync with our fprintf()-alike features. --- strings/my_vsnprintf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index d917e9e11b2..e4302f50c58 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -99,7 +99,11 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) else if (*fmt == 'b') /* Buffer parameter */ { char *par = va_arg(ap, char *); - to=memmove(to, par, abs(width)); + DBUG_ASSERT(to <= end); + if (to + abs(width) + 1 > end) + width= end - to - 1; /* sign doesn't matter */ + memmove(to, par, abs(width)); + to+= width; continue; } else if (*fmt == 'd' || *fmt == 'u'|| *fmt== 'x') /* Integer parameter */