MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'suokko/stl_printf_remove_extra_null' into develop

develop
lethosor 2018-07-06 11:09:39 -04:00
parent f1684125ee 7a2245c2fa
commit dc6fd8d35c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/MiscUtils.cpp
Unescape Escape View File

@ -67,10 +67,10 @@ std::string stl_vsprintf(const char *fmt, va_list args) {
return std::string(&buf[0], rsz); /* Whole string fits to a single line buffer */ return std::string(&buf[0], rsz); /* Whole string fits to a single line buffer */
std::string rv; std::string rv;
// Allocate enough memory for the output and null termination // Allocate enough memory for the output and null termination
rv.resize(rsz+1); rv.resize(rsz);
rsz = vsnprintf(&rv[0], rv.size(), fmt, args); rsz = vsnprintf(&rv[0], rv.size()+1, fmt, args);
if (rsz + 1 < static_cast<int>(rv.size())) if (rsz < static_cast<int>(rv.size()))
rv.resize(std::max(rsz+1,0)); rv.resize(std::max(rsz,0));
return rv; return rv;
} }