Chromium Code Reviews| Index: sandbox/win/src/sandbox_nt_util.cc |
| diff --git a/sandbox/win/src/sandbox_nt_util.cc b/sandbox/win/src/sandbox_nt_util.cc |
| index 71314611283e85057964617b191b3514f18b964e..613d4859dd7488fe77bdec3707fc79cdb6e53a43 100644 |
| --- a/sandbox/win/src/sandbox_nt_util.cc |
| +++ b/sandbox/win/src/sandbox_nt_util.cc |
| @@ -11,7 +11,7 @@ |
| namespace sandbox { |
| // This is the list of all imported symbols from ntdll.dll. |
| -SANDBOX_INTERCEPT NtExports g_nt = { NULL }; |
| +SANDBOX_INTERCEPT NtExports g_nt; |
| } // namespace sandbox |
| @@ -208,15 +208,7 @@ bool ValidParameter(void* buffer, size_t size, RequiredAccess intent) { |
| NTSTATUS CopyData(void* destination, const void* source, size_t bytes) { |
| NTSTATUS ret = STATUS_SUCCESS; |
| __try { |
| - if (SandboxFactory::GetTargetServices()->GetState()->InitCalled()) { |
| - memcpy(destination, source, bytes); |
| - } else { |
| - const char* from = reinterpret_cast<const char*>(source); |
| - char* to = reinterpret_cast<char*>(destination); |
| - for (size_t i = 0; i < bytes; i++) { |
|
cpu_(ooo_6.6-7.5)
2013/11/29 18:30:07
nice
robertshield
2013/11/29 19:29:08
Ricardo's idea :)
|
| - to[i] = from[i]; |
| - } |
| - } |
| + g_nt.memcpy(destination, source, bytes); |
| } __except(EXCEPTION_EXECUTE_HANDLER) { |
| ret = GetExceptionCode(); |
| } |