mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
Missing null checks and small style fixes
This commit is contained in:
@ -511,18 +511,23 @@ hsBool pfGUIEditBoxMod::HandleKeyEvent( pfGameGUIMgr::EventType event, plKeyDef
|
|||||||
else if (key == KEY_V)
|
else if (key == KEY_V)
|
||||||
{
|
{
|
||||||
wchar_t* contents = plClipboard::GetInstance().GetClipboardText();
|
wchar_t* contents = plClipboard::GetInstance().GetClipboardText();
|
||||||
size_t len = wcslen(contents);
|
if (contents != nil)
|
||||||
if (len > 0) {
|
{
|
||||||
wchar_t* insertTarget = fBuffer + fCursorPos;
|
size_t len = wcslen(contents);
|
||||||
size_t bufferTailLen = wcslen(insertTarget);
|
if (len > 0)
|
||||||
if (fCursorPos + len + bufferTailLen < fBufferSize) {
|
{
|
||||||
memmove(insertTarget + len, insertTarget, bufferTailLen * sizeof(wchar_t));
|
wchar_t* insertTarget = fBuffer + fCursorPos;
|
||||||
memcpy(insertTarget, contents, len * sizeof(wchar_t));
|
size_t bufferTailLen = wcslen(insertTarget);
|
||||||
fCursorPos += len;
|
if (fCursorPos + len + bufferTailLen < fBufferSize)
|
||||||
HandleExtendedEvent( kValueChanging );
|
{
|
||||||
|
memmove(insertTarget + len, insertTarget, bufferTailLen * sizeof(wchar_t));
|
||||||
|
memcpy(insertTarget, contents, len * sizeof(wchar_t));
|
||||||
|
fCursorPos += len;
|
||||||
|
HandleExtendedEvent( kValueChanging );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
delete contents;
|
||||||
}
|
}
|
||||||
delete contents;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1226,8 +1226,11 @@ hsBool pfGUIMultiLineEditCtrl::HandleKeyEvent( pfGameGUIMgr::EventType event, pl
|
|||||||
else if (key == KEY_V)
|
else if (key == KEY_V)
|
||||||
{
|
{
|
||||||
wchar_t* contents = plClipboard::GetInstance().GetClipboardText();
|
wchar_t* contents = plClipboard::GetInstance().GetClipboardText();
|
||||||
InsertString(contents);
|
if (contents != nil)
|
||||||
delete contents;
|
{
|
||||||
|
InsertString(contents);
|
||||||
|
delete contents;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user