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

sandbox/src/process_policy_test.cc

Index: sandbox/src/process_policy_test.cc
===================================================================
--- sandbox/src/process_policy_test.cc	(revision 21664)
+++ sandbox/src/process_policy_test.cc	(working copy)
@@ -99,7 +99,7 @@
   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]);
@@ -163,7 +163,7 @@
   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]);
Property changes on: sandbox\src\process_policy_test.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/sandbox/src/process_policy_test.cc:r69-2775
   Merged /trunk/src/sandbox/src/process_policy_test.cc:r21292