fix unsafe string handling in wxGetTranslation

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@73 1a98c847-1fd6-4fd8-948a-caf3550aa51b

serialize.h

@@ -20,7 +20,7 @@ class CDataStream;
 class CAutoFile;
 
 static const int VERSION = 207;
-static const char* pszSubVer = ".0";
+static const char* pszSubVer = ".1";
 
 
 

util.cpp

@@ -445,17 +445,17 @@ const char* wxGetTranslation(const char* pszEnglish)
             return (*mi).second;
 
         // wxWidgets translation
-        const char* pszTranslated = wxGetTranslation(wxString(pszEnglish, wxConvUTF8)).utf8_str();
+        wxString strTranslated = wxGetTranslation(wxString(pszEnglish, wxConvUTF8));
 
         // We don't cache unknown strings because caller might be passing in a
         // dynamic string and we would keep allocating memory for each variation.
-        if (strcmp(pszEnglish, pszTranslated) == 0)
+        if (strcmp(pszEnglish, strTranslated.utf8_str()) == 0)
             return pszEnglish;
 
         // Add to cache, memory doesn't need to be freed.  We only cache because
         // we must pass back a pointer to permanently allocated memory.
-        char* pszCached = new char[strlen(pszTranslated)+1];
+        char* pszCached = new char[strlen(strTranslated.utf8_str())+1];
-        strcpy(pszCached, pszTranslated);
+        strcpy(pszCached, strTranslated.utf8_str());
         mapCache[pszEnglish] = pszCached;
         return pszCached;
     }