database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.1' into 10.2

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-12-22 12:23:39 +02:00
parent a76a2522ec 461cf3e5a3
commit 985d2d393c
87 changed files with 1806 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
strings/my_vsnprintf.c
View File

@ -752,14 +752,14 @@ int my_vfprintf(FILE *stream, const char* format, va_list args)
and try again.
*/
if (alloc)
(*my_str_free)(p);
my_free(p);
else
alloc= 1;
new_len= cur_len*2;
if (new_len < cur_len)
return 0; /* Overflow */
cur_len= new_len;
p= (*my_str_malloc)(cur_len);
p= my_malloc(cur_len, MYF(MY_FAE));
if (!p)
return 0;
}
@ -767,7 +767,7 @@ int my_vfprintf(FILE *stream, const char* format, va_list args)
if (fputs(p, stream) < 0)
ret= -1;
if (alloc)
(*my_str_free)(p);
my_free(p);
return ret;
}