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

Merge branch 'bug26522'

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-03 11:34:36 -04:00
commit fe8f774820
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug26522 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (security):
- Refrain from potentially insecure usage of strncat() in
configure_backtrace_handler(). Use snprintf() instead.
Fixes bug 26522; bugfix on
a969ce464dc23db39725a891d60537f3d3e51b50 (not in any tor
release).

9
src/lib/err/backtrace.c
View File

@ -35,6 +35,7 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#ifdef HAVE_CYGWIN_SIGNAL_H
#include <cygwin/signal.h>
@ -264,16 +265,12 @@ dump_stack_symbols_to_error_fds(void)
int
configure_backtrace_handler(const char *tor_version)
{
char version[128];
strncpy(version, "Tor", sizeof(version)-1);
char version[128] = "Tor\0";
if (tor_version) {
strncat(version, " ", sizeof(version)-1);
strncat(version, tor_version, sizeof(version)-1);
snprintf(version, sizeof(version), "Tor %s", tor_version);
}
version[sizeof(version) - 1] = 0;
return install_bt_handler(version);
}