mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixing wrong memory read problem detected by Valgrind in "xml" test.

Browse source 
The source of the problem was in my_vsnprintf() implementation.


strings/my_vsnprintf.c:
  Fixing a problem in vsnprintf('%.*s', len, ptr)
  When processing the above format, it's incorrect
  to use strlen() because the string is not necessarily
  a null terminated string.
  Changing strlen() followed by set_if_smaller()
  to strnlen() - which covers both cases - limiting
  by '\0' and by "len".
This commit is contained in:
unknown 2007-05-30 14:03:35 +05:00
commit 42eab5a2b1
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
strings/my_vsnprintf.c
View file

@ -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);