summaryrefslogtreecommitdiffstats
path: root/sandbox/win/src/process_thread_interception.cc
diff options
context:
space:
mode:
authorwfh <wfh@chromium.org>2016-01-25 12:12:39 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-25 20:13:58 +0000
commitffa50a6879c547a73b8813a96a6d8d00448064f1 (patch)
treebb7b41c2d2d1393112f9ee959249a62bfe8a1a6d /sandbox/win/src/process_thread_interception.cc
parentabe355b9079ce4d4a23f8abc36d7efde417c7597 (diff)
downloadchromium_src-ffa50a6879c547a73b8813a96a6d8d00448064f1.zip
chromium_src-ffa50a6879c547a73b8813a96a6d8d00448064f1.tar.gz
chromium_src-ffa50a6879c547a73b8813a96a6d8d00448064f1.tar.bz2
Make TargetCreateProcessA consistent with TargetCreateProcessW.
Add a test that would previously crash before this CL. BUG=580916 Review URL: https://codereview.chromium.org/1621413003 Cr-Commit-Position: refs/heads/master@{#371293}
Diffstat (limited to 'sandbox/win/src/process_thread_interception.cc')
-rw-r--r--sandbox/win/src/process_thread_interception.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sandbox/win/src/process_thread_interception.cc b/sandbox/win/src/process_thread_interception.cc
index bbf753e..f8a144f 100644
--- a/sandbox/win/src/process_thread_interception.cc
+++ b/sandbox/win/src/process_thread_interception.cc
@@ -331,7 +331,8 @@ BOOL WINAPI TargetCreateProcessA(CreateProcessAFunction orig_CreateProcessA,
LPVOID environment, LPCSTR current_directory,
LPSTARTUPINFOA startup_info,
LPPROCESS_INFORMATION process_information) {
- if (orig_CreateProcessA(application_name, command_line, process_attributes,
+ if (SandboxFactory::GetTargetServices()->GetState()->IsCsrssConnected() &&
+ orig_CreateProcessA(application_name, command_line, process_attributes,
thread_attributes, inherit_handles, flags,
environment, current_directory, startup_info,
process_information)) {