nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

better handle the case where *strp is in asprintf args

Browse Source
This commit is contained in:
Nick Mathewson 2010-02-28 21:46:46 -05:00
parent 6fa8dacb97
commit 897b0ebbac
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/compat.c
View File

@ -345,11 +345,15 @@ tor_asprintf(char **strp, const char *fmt, ...)
int
tor_vasprintf(char **strp, const char *fmt, va_list args)
{
/* use a temporary variable in case *strp is in args. */
char *strp_tmp=NULL;
#ifdef HAVE_VASPRINTF
/* If the platform gives us one, use it. */
int r = vasprintf(strp, fmt, args);
int r = vasprintf(&strp_tmp, fmt, args);
if (r < 0)
*strp = NULL;
else
*strp = strp_tmp;
return r;
#elif defined(MS_WINDOWS)
/* On Windows, _vsnprintf won't tell us the length of the string if it
@ -358,15 +362,17 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
char *res;
len = _vcsprintf(fmt, args);
if (len < 0) {
strp = NULL;
*strp = NULL;
return -1;
}
*strp = tor_malloc(len + 1);
r = _vsnprintf(*strp, len+1, fmt, args);
strp_tmp = tor_malloc(len + 1);
r = _vsnprintf(strp_tmp, len+1, fmt, args);
if (r != len) {
tor_free(*strp);
tor_free(strp_tmp);
*strp = NULL;
return -1;
}
*strp = strp_tmp;
return len;
#else
/* Everywhere else, we have a decent vsnprintf that tells us how many
@ -383,12 +389,14 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
*strp = tor_strdup(buf);
return len;
}
*strp = tor_malloc(len+1);
r = vsnprintf(*strp, len+1, fmt, args);
strp_tmp = tor_malloc(len+1);
r = vsnprintf(strp_tmp, len+1, fmt, args);
if (r != len) {
tor_free(*strp);
tor_free(strp_tmp);
*strp = NULL;
return -1;
}
*strp = strp_tmp;
return len;
#endif
}