diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-07 19:42:01 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-07 20:22:06 -0600 |
| commit | c4df69a342bd37420b61ebe6df6a0c6af915c877 (patch) | |
| tree | d00451f654656768c1b24c94f2a99e5eb206a096 /Source/Core/Common/Src/StringUtil.cpp | |
| parent | a2ca76ebd9c3300735c438b5ddc7bc726001b41a (diff) | |
| parent | 95d08db46fd54b37cb375980f97e1c0e11676419 (diff) | |
Merge branch 'master' into real-wiimote-scanning
Conflicts:
Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
Diffstat (limited to 'Source/Core/Common/Src/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/Src/StringUtil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 664987d350..e5c70b2c6b 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -69,7 +69,8 @@ std::string StringFromFormat(const char* format, ...) delete[] buf; #else va_start(args, format); - vasprintf(&buf, format, args); + if (vasprintf(&buf, format, args) < 0) + ERROR_LOG(COMMON, "Unable to allocate memory for string"); va_end(args); std::string temp = buf; |