Merge branch 'bb-10.5-release' into bb-10.6-release10.6-halfmerge

1 files changed, 8 insertions, 2 deletions

diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 9b7cea54d00..166ec55b9b3 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1161,9 +1161,12 @@ static size_t
 my_snprintf_mb2(CHARSET_INFO *cs __attribute__((unused)),
                 char* to, size_t n, const char* fmt, ...)
 {
+  size_t ret;
   va_list args;
   va_start(args,fmt);
-  return my_vsnprintf_mb2(to, n, fmt, args);
+  ret= my_vsnprintf_mb2(to, n, fmt, args);
+  va_end(args);
+  return ret;
 }
 
 
@@ -2393,9 +2396,12 @@ static size_t
 my_snprintf_utf32(CHARSET_INFO *cs __attribute__((unused)),
                   char* to, size_t n, const char* fmt, ...)
 {
+  size_t ret;
   va_list args;
   va_start(args,fmt);
-  return my_vsnprintf_utf32(to, n, fmt, args);
+  ret= my_vsnprintf_utf32(to, n, fmt, args);
+  va_end(args);
+  return ret;
 }