diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/sandbox | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/sandbox')
| -rw-r--r-- | chromium/sandbox/win/sandbox_poc/pocdll/fs.cc | 2 | ||||
| -rw-r--r-- | chromium/sandbox/win/src/handle_policy.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/sandbox/win/sandbox_poc/pocdll/fs.cc b/chromium/sandbox/win/sandbox_poc/pocdll/fs.cc index 9a5b2bc3ca5..5fab41b5647 100644 --- a/chromium/sandbox/win/sandbox_poc/pocdll/fs.cc +++ b/chromium/sandbox/win/sandbox_poc/pocdll/fs.cc @@ -14,7 +14,7 @@ void TryOpenFile(wchar_t *path, FILE *output) { wchar_t path_expanded[MAX_PATH] = {0}; DWORD size = ::ExpandEnvironmentStrings(path, path_expanded, MAX_PATH - 1); if (!size) { - fprintf(output, "[ERROR] Cannot expand \"%S\". Error %d.\r\n", path, + fprintf(output, "[ERROR] Cannot expand \"%S\". Error %S.\r\n", path, ::GetLastError()); } diff --git a/chromium/sandbox/win/src/handle_policy.cc b/chromium/sandbox/win/src/handle_policy.cc index 718376ecee1..eeeea7b6e18 100644 --- a/chromium/sandbox/win/src/handle_policy.cc +++ b/chromium/sandbox/win/src/handle_policy.cc @@ -79,7 +79,7 @@ DWORD HandlePolicy::DuplicateHandleProxyAction(EvalResult eval_result, // If the policy didn't block us and we have no valid target, then the broker // (this process) is the valid target. HANDLE target_process = remote_target_process.IsValid() ? - remote_target_process.Get() : ::GetCurrentProcess(); + remote_target_process : ::GetCurrentProcess(); DWORD result = ERROR_SUCCESS; if (!::DuplicateHandle(client_info.process, source_handle, target_process, target_handle, desired_access, FALSE, |