Commit fd70d5e9 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Bug#35987 - post-review fix

Correct usage of strncat() in get_symbol_path()

3rd parameter to strncat is changed to be count of 
remaining bytes in the output buffer minus 1.
parent ef1d6cca
...@@ -391,7 +391,12 @@ static void get_symbol_path(char *path, size_t size) ...@@ -391,7 +391,12 @@ static void get_symbol_path(char *path, size_t size)
if (!strstr(path, module_dir)) if (!strstr(path, module_dir))
{ {
strncat(path, module_dir, size); size_t dir_len = strlen(module_dir);
if (size > dir_len)
{
strncat(path, module_dir, size-1);
size -= dir_len;
}
} }
} }
CloseHandle(hSnap); CloseHandle(hSnap);
...@@ -399,9 +404,9 @@ static void get_symbol_path(char *path, size_t size) ...@@ -399,9 +404,9 @@ static void get_symbol_path(char *path, size_t size)
/* Add _NT_SYMBOL_PATH, if present. */ /* Add _NT_SYMBOL_PATH, if present. */
envvar= getenv("_NT_SYMBOL_PATH"); envvar= getenv("_NT_SYMBOL_PATH");
if(envvar) if(envvar && size)
{ {
strncat(path, envvar, size); strncat(path, envvar, size-1);
} }
} }
...@@ -423,7 +428,7 @@ void print_stacktrace(gptr unused1, ulong unused2) ...@@ -423,7 +428,7 @@ void print_stacktrace(gptr unused1, ulong unused2)
int i; int i;
CONTEXT context; CONTEXT context;
STACKFRAME64 frame={0}; STACKFRAME64 frame={0};
static char symbol_path[MAX_SYMBOL_PATH+1]; static char symbol_path[MAX_SYMBOL_PATH];
if(!exception_ptrs || !init_dbghelp_functions()) if(!exception_ptrs || !init_dbghelp_functions())
return; return;
...@@ -432,7 +437,7 @@ void print_stacktrace(gptr unused1, ulong unused2) ...@@ -432,7 +437,7 @@ void print_stacktrace(gptr unused1, ulong unused2)
context = *(exception_ptrs->ContextRecord); context = *(exception_ptrs->ContextRecord);
/*Initialize symbols.*/ /*Initialize symbols.*/
pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG); pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG);
get_symbol_path(symbol_path, MAX_SYMBOL_PATH); get_symbol_path(symbol_path, sizeof(symbol_path));
pSymInitialize(hProcess, symbol_path, TRUE); pSymInitialize(hProcess, symbol_path, TRUE);
/*Prepare stackframe for the first StackWalk64 call*/ /*Prepare stackframe for the first StackWalk64 call*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment