mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Fixed tor_vasprintf on systems without vasprintf.
If tor is compiled on a system with neither vasprintf nor _vscprintf, the fallback implementation exposes a logic flaw which prevents proper usage of strings longer than 127 characters: * tor_vsnprintf returns -1 if supplied buffer is not large enough, but tor_vasprintf uses this function to retrieve required length * the result of tor_vsnprintf is not properly checked for negative return values Both aspects together could in theory lead to exposure of uninitialized stack memory in the resulting string. This requires an invalid format string or data that exceeds integer limitations. Fortunately tor is not even able to run with this implementation because it runs into asserts early on during startup. Also the unit tests fail during a "make check" run. Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org> [backported to 0.2.9 by nickm]
This commit is contained in:
parent
4e262196a8
commit
0d5a0b4f0c
@ -558,10 +558,17 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
|
|||||||
int len, r;
|
int len, r;
|
||||||
va_list tmp_args;
|
va_list tmp_args;
|
||||||
va_copy(tmp_args, args);
|
va_copy(tmp_args, args);
|
||||||
/* vsnprintf() was properly checked but tor_vsnprintf() available so
|
/* Use vsnprintf to retrieve needed length. tor_vsnprintf() is not an option
|
||||||
* why not use it? */
|
* here because it will simply return -1 if buf is not large enough to hold the
|
||||||
len = tor_vsnprintf(buf, sizeof(buf), fmt, tmp_args);
|
* complete string.
|
||||||
|
*/
|
||||||
|
len = vsnprintf(buf, sizeof(buf), fmt, tmp_args);
|
||||||
va_end(tmp_args);
|
va_end(tmp_args);
|
||||||
|
buf[sizeof(buf) - 1] = '\0';
|
||||||
|
if (len < 0) {
|
||||||
|
*strp = NULL;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
if (len < (int)sizeof(buf)) {
|
if (len < (int)sizeof(buf)) {
|
||||||
*strp = tor_strdup(buf);
|
*strp = tor_strdup(buf);
|
||||||
return len;
|
return len;
|
||||||
|
Loading…
Reference in New Issue
Block a user