CJSONVariantWriter: fix possible NULL pointer dereferencing

xbmc · Mar 11, 2013 · 32b2e2b · 32b2e2b
1 parent d6f3d21
commit 32b2e2b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/xbmc/utils/JSONVariantWriter.cpp b/xbmc/utils/JSONVariantWriter.cpp
@@ -38,8 +38,9 @@ string CJSONVariantWriter::Write(const CVariant &value, bool compact)
 #endif
 
   // Set locale to classic ("C") to ensure valid JSON numbers
-  std::string currentLocale = setlocale(LC_NUMERIC, NULL);
-  setlocale(LC_NUMERIC, "C");
+  const char *currentLocale = setlocale(LC_NUMERIC, NULL);
+  if (currentLocale != NULL)
+    setlocale(LC_NUMERIC, "C");
 
   if (InternalWrite(g, value))
   {
@@ -56,7 +57,8 @@ string CJSONVariantWriter::Write(const CVariant &value, bool compact)
   }
 
   // Re-set locale to what it was before using yajl
-  setlocale(LC_NUMERIC, currentLocale.c_str());
+  if (currentLocale != NULL)
+    setlocale(LC_NUMERIC, currentLocale);
 
   yajl_gen_clear(g);
   yajl_gen_free(g);