Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Avoid buffer overflow assertion failures when dumping stack trace on Windows.

Browse Source 
Try to be marginally less likely to get stuck in infinite recursion.

This was SVN commit r8669.
This commit is contained in:
Ykkrosh 2010-11-20 21:26:22 +00:00
parent ed5d91e71f
commit 80888a7325
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/lib/sysdep/os/win/wdbg_sym.cpp
View File

@ -525,7 +525,9 @@ static void out(const wchar_t* fmt, ...)
{
va_list args;
va_start(args, fmt);
int len = vswprintf_s(out_pos, out_chars_left, fmt, args);
// use vswprintf, not vswprintf_s, because we want to gracefully
// handle buffer overflows
int len = vswprintf(out_pos, out_chars_left, fmt, args);
va_end(args);
// success
@ -1150,7 +1152,7 @@ static LibError dump_sym_data(DWORD id, const u8* p, DumpState state)
SYMBOL_INFO_PACKAGEW2 sp;
SYMBOL_INFOW* sym = &sp.si;
if(!pSymFromIndexW(hProcess, mod_base, id, sym))
WARN_RETURN(ERR::SYM_TYPE_INFO_UNAVAILABLE);
RETURN_ERR(ERR::SYM_TYPE_INFO_UNAVAILABLE);
out(L"%ls = ", sym->Name);