Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 16:05:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] Protect certain actions with a critical section, patch by Katayama Hirofumi

Browse source 
See issue #5406 for more details.

svn path=/trunk/; revision=47502
This commit is contained in:
Gregor Schneider 2010-05-31 18:38:48 +00:00
parent b95825c931
commit bd17e097fa
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
reactos/base/shell/cmd/cmd.c
View file

@ -156,7 +156,7 @@ BOOL bCanExit = TRUE; /* indicates if this shell is exitable */
BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */
BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */
INT nErrorLevel = 0; /* Errorlevel of last launched external program */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */
BOOL bChildProcessRunning = FALSE; CRITICAL_SECTION ChildProcessRunningLock;
BOOL bUnicodeOutput = FALSE; BOOL bUnicodeOutput = FALSE;
BOOL bDisableBatchEcho = FALSE; BOOL bDisableBatchEcho = FALSE;
BOOL bDelayedExpansion = FALSE; BOOL bDelayedExpansion = FALSE;
@ -436,14 +436,12 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
{ {
if (IsConsoleProcess(prci.hProcess)) if (IsConsoleProcess(prci.hProcess))
{ {
/* FIXME: Protect this with critical section */ EnterCriticalSection(&ChildProcessRunningLock);
bChildProcessRunning = TRUE;
dwChildProcessId = prci.dwProcessId; dwChildProcessId = prci.dwProcessId;
WaitForSingleObject (prci.hProcess, INFINITE); WaitForSingleObject (prci.hProcess, INFINITE);
/* FIXME: Protect this with critical section */ LeaveCriticalSection(&ChildProcessRunningLock);
bChildProcessRunning = FALSE;
GetExitCodeProcess (prci.hProcess, &dwExitCode); GetExitCodeProcess (prci.hProcess, &dwExitCode);
nErrorLevel = (INT)dwExitCode; nErrorLevel = (INT)dwExitCode;
@ -665,9 +663,9 @@ ExecutePipeline(PARSED_COMMAND *Cmd)
SetStdHandle(STD_INPUT_HANDLE, hOldConIn); SetStdHandle(STD_INPUT_HANDLE, hOldConIn);
/* Wait for all processes to complete */ /* Wait for all processes to complete */
bChildProcessRunning = TRUE; EnterCriticalSection(&ChildProcessRunningLock);
WaitForMultipleObjects(nProcesses, hProcess, TRUE, INFINITE); WaitForMultipleObjects(nProcesses, hProcess, TRUE, INFINITE);
bChildProcessRunning = FALSE; LeaveCriticalSection(&ChildProcessRunningLock);
/* Use the exit code of the last process in the pipeline */ /* Use the exit code of the last process in the pipeline */
GetExitCodeProcess(hProcess[nProcesses - 1], &dwExitCode); GetExitCodeProcess(hProcess[nProcesses - 1], &dwExitCode);
@ -1439,13 +1437,16 @@ BOOL WINAPI BreakHandler (DWORD dwCtrlType)
} }
} }
if (bChildProcessRunning == TRUE) if (!TryEnterCriticalSection(&ChildProcessRunningLock))
{ {
SelfGenerated = TRUE; SelfGenerated = TRUE;
GenerateConsoleCtrlEvent (dwCtrlType, 0); GenerateConsoleCtrlEvent (dwCtrlType, 0);
return TRUE; return TRUE;
} }
else
{
LeaveCriticalSection(&ChildProcessRunningLock);
}
rec.EventType = KEY_EVENT; rec.EventType = KEY_EVENT;
rec.Event.KeyEvent.bKeyDown = TRUE; rec.Event.KeyEvent.bKeyDown = TRUE;
@ -1797,6 +1798,7 @@ static VOID Cleanup()
RemoveBreakHandler (); RemoveBreakHandler ();
SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ), SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ),
ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT );
DeleteCriticalSection(&ChildProcessRunningLock);
} }
/* /*
@ -1808,6 +1810,7 @@ int cmd_main (int argc, const TCHAR *argv[])
TCHAR startPath[MAX_PATH]; TCHAR startPath[MAX_PATH];
CONSOLE_SCREEN_BUFFER_INFO Info; CONSOLE_SCREEN_BUFFER_INFO Info;
InitializeCriticalSection(&ChildProcessRunningLock);
lpOriginalEnvironment = DuplicateEnvironment(); lpOriginalEnvironment = DuplicateEnvironment();
GetCurrentDirectory(MAX_PATH,startPath); GetCurrentDirectory(MAX_PATH,startPath);