diff options
Diffstat (limited to 'sandbox/src')
| -rw-r--r-- | sandbox/src/interception.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/interception_unittest.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/sandbox_nt_util.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/unload_dll_test.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/win2k_threadpool.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sandbox/src/interception.cc b/sandbox/src/interception.cc index 621a27d..3e3b54f 100644 --- a/sandbox/src/interception.cc +++ b/sandbox/src/interception.cc @@ -237,7 +237,7 @@ bool InterceptionManager::SetupInterceptionInfo(const InterceptionData& data, DCHECK(buffer); DCHECK(*buffer); - if ((dll_info->unload_module) && + if ((dll_info->unload_module) && (data.function != kUnloadDLLDummyFunction)) { // Can't specify a dll for both patch and unload. NOTREACHED(); diff --git a/sandbox/src/interception_unittest.cc b/sandbox/src/interception_unittest.cc index 551aaa5..78c6f7c 100644 --- a/sandbox/src/interception_unittest.cc +++ b/sandbox/src/interception_unittest.cc @@ -184,7 +184,7 @@ TEST(InterceptionManagerTest, BufferLayout2) { // groups: one group with the local ("cold") interceptions, and another // group with the interceptions belonging to dlls that will be "hot" // patched on the client. The second group lives on local_buffer, and the - // first group remains on the list of interceptions, in this case just one. + // first group remains on the list of interceptions, in this case just one. EXPECT_EQ(1, interceptions.interceptions_.size()); int num_dlls, num_functions, num_names; diff --git a/sandbox/src/sandbox_nt_util.cc b/sandbox/src/sandbox_nt_util.cc index a7f1be0..f233088 100644 --- a/sandbox/src/sandbox_nt_util.cc +++ b/sandbox/src/sandbox_nt_util.cc @@ -342,7 +342,7 @@ UNICODE_STRING* GetBackingFilePath(PVOID address) { } UNICODE_STRING* ExtractModuleName(const UNICODE_STRING* module_path) { - if ((!module_path) || (!module_path->Buffer)) + if ((!module_path) || (!module_path->Buffer)) return NULL; wchar_t* sep = NULL; diff --git a/sandbox/src/unload_dll_test.cc b/sandbox/src/unload_dll_test.cc index 55994b7..9441d7c 100644 --- a/sandbox/src/unload_dll_test.cc +++ b/sandbox/src/unload_dll_test.cc @@ -26,7 +26,7 @@ SBOX_TESTS_COMMAND int UseOneDLL(int argc, wchar_t **argv) { if ((option == L'U') || (option == L'B')) { HMODULE module2 = ::GetModuleHandleW(argv[1]); - rv = FreeLibrary(module2) ? SBOX_TEST_SUCCEEDED : SBOX_TEST_FAILED; + rv = FreeLibrary(module2) ? SBOX_TEST_SUCCEEDED : SBOX_TEST_FAILED; } return rv; } diff --git a/sandbox/src/win2k_threadpool.cc b/sandbox/src/win2k_threadpool.cc index 2882e3d..88801a0 100644 --- a/sandbox/src/win2k_threadpool.cc +++ b/sandbox/src/win2k_threadpool.cc @@ -62,4 +62,4 @@ Win2kThreadPool::~Win2kThreadPool() { ::DeleteCriticalSection(&lock_); } -} // namespace sandbox
\ No newline at end of file +} // namespace sandbox |