BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Prevent crash in CIrrDeviceMacOSX::setWindowCaption with cyrillic strings.

Browse Source 
Thanks @Maksym Hamarnyk for proposing a patch and testing some changes.
May break OSX 10.5 and older (lack of test-system, but probably not much used anymore).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6194 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2021-02-21 19:07:46 +00:00
parent cb2aaf8255
commit 155c7f7592
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/Irrlicht/CIrrDeviceOSX.mm
View File

@ -1065,20 +1065,28 @@ void CIrrDeviceMacOSX::sleep(u32 timeMs, bool pauseTimer=false)
void CIrrDeviceMacOSX::setWindowCaption(const wchar_t* text) void CIrrDeviceMacOSX::setWindowCaption(const wchar_t* text)
{ {
size_t size;
char title[1024];
if (Window != NULL) if (Window != NULL)
{ {
size = wcstombs(title,text,1024); if ( text )
title[1023] = 0; {
#ifdef __MAC_10_6 size_t numBytes = wcslen(text) * sizeof(wchar_t);
NSString* name = [NSString stringWithCString:title encoding:NSUTF8StringEncoding];
#ifdef __BIG_ENDIAN__
NSStringEncoding encode = sizeof(wchar_t) == 4 ? NSUTF32BigEndianStringEncoding : NSUTF16BigEndianStringEncoding;
#else #else
NSString* name = [NSString stringWithCString:title length:size]; NSStringEncoding encode = sizeof(wchar_t) == 4 ? NSUTF32LittleEndianStringEncoding : NSUTF16LittleEndianStringEncoding;
#endif #endif
[Window setTitle:name]; NSString* name = [[NSString alloc] initWithBytes:text length:numBytes encoding:encode];
[name release]; if ( name )
{
[Window setTitle:name];
[name release];
}
}
else
{
[Window setTitle:@""];
}
} }
} }