LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

fix unsafe string handling in wxGetTranslation

Browse source
This commit is contained in:
s_nakamoto 2010-02-28 15:00:32 +00:00
parent 8a46ed83cc
commit 9a33582204
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
serialize.h
View file

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

8
util.cpp
View file

@ -445,17 +445,17 @@ const char* wxGetTranslation(const char* pszEnglish)
return (*mi).second; return (*mi).second;
// wxWidgets translation // 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 // We don't cache unknown strings because caller might be passing in a
// dynamic string and we would keep allocating memory for each variation. // 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; return pszEnglish;
// Add to cache, memory doesn't need to be freed. We only cache because // Add to cache, memory doesn't need to be freed. We only cache because
// we must pass back a pointer to permanently allocated memory. // 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; mapCache[pszEnglish] = pszCached;
return pszCached; return pszCached;
} }