Merge 21292 - Fix FORWARD_NULL defects reported by Coverity. We should...

sandbox/src/process_policy_test.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <memory>
 
 #include "base/scoped_handle_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "sandbox/src/sandbox.h"
@@ skipping 81 matching lines @@
 
 namespace sandbox {
 
 // Tries to create the process in argv[0] using 7 different ways.
 // Since we also try the Ansi and Unicode version of the CreateProcess API,
 // The process referenced by argv[0] will be spawned 14 times.
 SBOX_TESTS_COMMAND int Process_RunApp(int argc, wchar_t **argv) {
   if (argc != 1) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
-  if ((NULL != argv) && (NULL == argv[0])) {
+  if ((NULL == argv) || (NULL == argv[0])) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
   std::wstring path = MakeFullPathToSystem32(argv[0]);
 
   // TEST 1: Try with the path in the app_name.
   int result1 = CreateProcessHelper(path, std::wstring());
 
   // TEST 2: Try with the path in the cmd_line.
   std::wstring cmd_line = L"\"";
   cmd_line += path;
@@ skipping 43 matching lines @@
     return result1;
 
   return SBOX_TEST_FAILED;
 }
 
 // Creates a process and checks if it's possible to get a handle to it's token.
 SBOX_TESTS_COMMAND int Process_GetChildProcessToken(int argc, wchar_t **argv) {
   if (argc != 1)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
-  if ((NULL != argv) && (NULL == argv[0]))
+  if ((NULL == argv) || (NULL == argv[0]))
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   std::wstring path = MakeFullPathToSystem32(argv[0]);
 
   PROCESS_INFORMATION pi = {0};
   STARTUPINFOW si = {sizeof(si)};
 
   if (!::CreateProcessW(path.c_str(), NULL, NULL, NULL, FALSE, CREATE_SUSPENDED,
                         NULL, NULL, &si, &pi)) {
       return SBOX_TEST_FAILED;
@@ skipping 106 matching lines @@
   ASSERT_TRUE(!exe_path.empty());
   EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_PROCESS,
                              TargetPolicy::PROCESS_ALL_EXEC,
                              exe_path.c_str()));
 
   EXPECT_EQ(SBOX_TEST_SUCCEEDED,
             runner.RunTest(L"Process_GetChildProcessToken findstr.exe"));
 }
 
 }  // namespace sandbox