diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-08 18:45:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-08 18:45:10 -0500 |
| commit | 31f41fe09613398dc818ae30251724779f1f53c8 (patch) | |
| tree | 9f35daf845db83f00ba2f7caab08888483b76e54 | |
| parent | 053cf55cab4753cf0bcfb7e3bc7cf7038833a3a7 (diff) | |
| parent | 286fa94064dcc6d1b260bec77de052274e3c4403 (diff) | |
| download | tor-31f41fe09613398dc818ae30251724779f1f53c8.tar.gz tor-31f41fe09613398dc818ae30251724779f1f53c8.zip | |
Merge branch 'maint-0.2.9'
| -rw-r--r-- | changes/bug20560 | 4 | ||||
| -rw-r--r-- | src/common/compat.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug20560 b/changes/bug20560 new file mode 100644 index 0000000000..43d605b296 --- /dev/null +++ b/changes/bug20560 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Run correctly when built on Windows build environments that require + _vcsprintf(). Fixes bug 20560; bugfix on 0.2.2.11-alpha. + diff --git a/src/common/compat.c b/src/common/compat.c index 4f2f9778f2..8d6a491c42 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -532,7 +532,10 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) /* On Windows, _vsnprintf won't tell us the length of the string if it * overflows, so we need to use _vcsprintf to tell how much to allocate */ int len, r; - len = _vscprintf(fmt, args); + va_list tmp_args; + va_copy(tmp_args, args); + len = _vscprintf(fmt, tmp_args); + va_end(tmp_args); if (len < 0) { *strp = NULL; return -1; |