thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: Fix invalid buffer size in CFStringGetCString call

Browse source
This commit is contained in:
Matthew Hoops 2014-06-01 17:01:57 -04:00
parent 00f23b26c5
commit 7af36e9724
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/platform/sdl/macosx/macosx.cpp
View file

@ -145,7 +145,7 @@ Common::String OSystem_MacOSX::getSystemLanguage() const {
for (CFIndex i = 0 ; i < localizationsSize ; ++i) { for (CFIndex i = 0 ; i < localizationsSize ; ++i) {
CFStringRef language = (CFStringRef)CFArrayGetValueAtIndex(preferredLocalizations, i); CFStringRef language = (CFStringRef)CFArrayGetValueAtIndex(preferredLocalizations, i);
char buffer[10]; char buffer[10];
CFStringGetCString(language, buffer, 50, kCFStringEncodingASCII); CFStringGetCString(language, buffer, sizeof(buffer), kCFStringEncodingASCII);
int32 languageId = TransMan.findMatchingLanguage(buffer); int32 languageId = TransMan.findMatchingLanguage(buffer);
if (languageId != -1) { if (languageId != -1) {
CFRelease(preferredLocalizations); CFRelease(preferredLocalizations);
@ -156,7 +156,7 @@ Common::String OSystem_MacOSX::getSystemLanguage() const {
if (localizationsSize > 0) { if (localizationsSize > 0) {
CFStringRef language = (CFStringRef)CFArrayGetValueAtIndex(preferredLocalizations, 0); CFStringRef language = (CFStringRef)CFArrayGetValueAtIndex(preferredLocalizations, 0);
char buffer[10]; char buffer[10];
CFStringGetCString(language, buffer, 50, kCFStringEncodingASCII); CFStringGetCString(language, buffer, sizeof(buffer), kCFStringEncodingASCII);
CFRelease(preferredLocalizations); CFRelease(preferredLocalizations);
return buffer; return buffer;
} }