zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-01 08:31:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed infinite execution of error CCMD

Browse source 
https://forum.zdoom.org/viewtopic.php?t=54659
This commit is contained in:
alexey.lysiuk 2016-12-22 11:00:20 +02:00 committed by Christoph Oelckers
parent b15e620ea8
commit 7dd51d6d1c
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/c_console.cpp
View file

@ -1523,8 +1523,6 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
buffer.Text.StripLeftRight(); buffer.Text.StripLeftRight();
Printf(127, TEXTCOLOR_WHITE "]%s\n", buffer.Text.GetChars()); Printf(127, TEXTCOLOR_WHITE "]%s\n", buffer.Text.GetChars());
AddCommandString(buffer.Text.LockBuffer());
buffer.Text.UnlockBuffer();
if (buffer.Text.Len() == 0) if (buffer.Text.Len() == 0)
{ {
@ -1568,7 +1566,21 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
} }
} }
HistPos = NULL; HistPos = NULL;
{
// Work with a copy of command to avoid side effects caused by
// exception raised during execution, like with 'error' CCMD.
// It's problematic to maintain FString's lock symmetry.
static TArray<char> command;
const size_t length = buffer.Text.Len();
command.Resize(length + 1);
memcpy(&command[0], buffer.Text.GetChars(), length);
command[length] = '\0';
buffer.SetString(""); buffer.SetString("");
AddCommandString(&command[0]);
}
TabbedLast = false; TabbedLast = false;
TabbedList = false; TabbedList = false;
break; break;