Merge pull request #5290 from neomonkey/master

StringUtil: Fix possible bad free
dolphin-emu · Mar 26, 2018 · c55b3a6 · c55b3a6
2 parents 793c6d2 + 7169be2
commit c55b3a6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
@@ -173,7 +173,11 @@ std::string StringFromFormatV(const char* format, va_list args)
   locale_t previousLocale = uselocale(GetCLocale());
 #endif
   if (vasprintf(&buf, format, args) < 0)
+  {
     ERROR_LOG(COMMON, "Unable to allocate memory for string");
+    buf = nullptr;
+  }
+
 #if !defined(ANDROID) && !defined(__HAIKU__) && !defined(__OpenBSD__)
   uselocale(previousLocale);
 #endif