summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2012-12-10 09:55:08 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2012-12-10 09:55:08 +0100
commit8cd60993716707a6c9af4fcc9d6d6d26b9b155e3 (patch)
tree297d09ded26e0c3e8cbaf154a818830ead77e381 /strings
parentc3e918ea90764e233e1cdefbde3745740dc569a3 (diff)
downloadmariadb-git-8cd60993716707a6c9af4fcc9d6d6d26b9b155e3.tar.gz
Bug#15960005 VALGRIND WARNINGS IN PROCESS_ARGS
Both <width> and <precision> can be specified as numbers or '*'. If an asterisk is used, an argument of type int is consumed.
Diffstat (limited to 'strings')
-rw-r--r--strings/my_vsnprintf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index 73cbf02f148..b0fd83451a6 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -343,6 +343,7 @@ start:
print_arr[idx].length--;
DBUG_ASSERT(*fmt == '$' && print_arr[idx].length < MAX_ARGS);
args_arr[print_arr[idx].length].arg_type= 'd';
+ args_arr[print_arr[idx].length].have_longlong= 0;
print_arr[idx].flags|= LENGTH_ARG;
arg_count= max(arg_count, print_arr[idx].length + 1);
fmt++;
@@ -361,6 +362,7 @@ start:
print_arr[idx].width--;
DBUG_ASSERT(*fmt == '$' && print_arr[idx].width < MAX_ARGS);
args_arr[print_arr[idx].width].arg_type= 'd';
+ args_arr[print_arr[idx].width].have_longlong= 0;
print_arr[idx].flags|= WIDTH_ARG;
arg_count= max(arg_count, print_arr[idx].width + 1);
fmt++;