Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-03 19:59:09 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix #440 - Invalid use of va_list in r_str_newf for huge strings

Browse Source
This commit is contained in:
pancake 2013-12-10 00:47:23 +01:00
parent 893fd98b89
commit 160495aaeb
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libr/util/str.c
View File

@ -384,19 +384,25 @@ R_API const char *r_str_chop_ro(const char *str) {
}
R_API char *r_str_new(char *str) {
if (!str) return NULL;
return strdup (str);
}
R_API char *r_str_newf(const char *fmt, ...) {
int ret;
char string[1024];
va_list ap;
int ret, ret2;
char *p, string[1024];
va_list ap, ap2;
va_start (ap, fmt);
ret = vsnprintf (string, sizeof (string), fmt, ap);
if (ret>=sizeof(string)) {
char *p = malloc (ret+2);
va_start (ap2, fmt);
ret = vsnprintf (string, sizeof (string)-1, fmt, ap);
if (ret<1 || ret>=sizeof (string)) {
p = malloc (ret+2);
if (!p) return NULL;
vsnprintf (p, ret+1, fmt, ap);
ret2 = vsnprintf (p, ret+1, fmt, ap2);
if (ret2<1 || ret2>ret+1) {
free (p);
return NULL;
}
fmt = r_str_new (p);
free (p);
} else fmt = r_str_new (string);