Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Prevent buffer overrun from OSK dialog.

Browse source 
If there was never a null, by mistake, we'd corrupt memory and then crash.

Occurs in the "Sonymon" homebrew.
This commit is contained in:
Unknown W. Brackets 2016-06-26 20:28:01 -07:00
parent d25cc72021
commit dcf8da244d
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Core/Dialog/PSPOskDialog.cpp
View file

@ -161,12 +161,13 @@ void PSPOskDialog::ConvertUCS2ToUTF8(std::string& _string, const PSPPointer<u16_
return; return;
} }
char stringBuffer[2048]; const size_t maxLength = 2047;
char stringBuffer[maxLength + 1];
char *string = stringBuffer; char *string = stringBuffer;
auto input = em_address; u16_le *input = &em_address[0];
int c; int c;
while ((c = *input++) != 0) while ((c = *input++) != 0 && string < stringBuffer + maxLength)
{ {
if (c < 0x80) if (c < 0x80)
*string++ = c; *string++ = c;
@ -190,21 +191,15 @@ void GetWideStringFromPSPPointer(std::wstring& _string, const PSPPointer<u16_le>
_string = L""; _string = L"";
return; return;
} }
const size_t maxLength = 2048;
wchar_t stringBuffer[maxLength]; const size_t maxLength = 2047;
wchar_t stringBuffer[maxLength + 1];
wchar_t *string = stringBuffer; wchar_t *string = stringBuffer;
auto input = em_address; u16_le *input = &em_address[0];
int c; int c;
u32 count = 0; while ((c = *input++) != 0 && string < stringBuffer + maxLength)
while ((c = *input++) != 0)
{
if ( !(++count >= maxLength) )
*string++ = c; *string++ = c;
else
break;
}
*string++ = '\0'; *string++ = '\0';
_string = stringBuffer; _string = stringBuffer;
} }