Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-01-23 22:36:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix StringFromFormat() on MSVC 2015.

Browse Source
This commit is contained in:
Unknown W. Brackets 2015-09-07 10:27:36 -07:00
parent 936ccbf18a
commit d403ef6329
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ext/native/base/stringutil.cpp
View File

@ -117,28 +117,30 @@ void DataToHexString(const uint8_t *data, size_t size, std::string *output) {
std::string StringFromFormat(const char* format, ...)
{
va_list args;
char *buf = NULL;
std::string temp = "";
#ifdef _WIN32
int required = 0;
va_start(args, format);
required = _vscprintf(format, args);
buf = new char[required + 1];
if(vsnprintf(buf, required, format, args) < 0)
buf[0] = '\0';
// Using + 2 to be safe between MSVC versions.
// In MSVC 2015 and later, vsnprintf counts the trailing zero (per c++11.)
temp.resize(required + 2);
if (vsnprintf(&temp[0], required + 1, format, args) < 0) {
temp.resize(0);
} else {
temp.resize(required);
}
va_end(args);
buf[required] = '\0';
temp = buf;
delete[] buf;
#else
char *buf = nullptr;
va_start(args, format);
if(vasprintf(&buf, format, args) < 0)
buf = NULL;
if (vasprintf(&buf, format, args) < 0)
buf = nullptr;
va_end(args);
if(buf != NULL) {
if (buf != nullptr) {
temp = buf;
free(buf);
}