Fix ProcessOutputWatcherTest.OutputWatcher under ASAN

chrome/browser/chromeos/process_proxy/process_output_watcher_unittest.cc

 // Copyright (c) 2012 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 <gtest/gtest.h>
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 107 matching lines @@
   // TODO(tbarzic): We don't support stderr anymore, so this can be simplified.
   std::vector<TestCase> test_cases;
   test_cases.push_back(TestCase("testing output\n", PROCESS_OUTPUT_TYPE_OUT));
   test_cases.push_back(TestCase("testing error\n", PROCESS_OUTPUT_TYPE_OUT));
   test_cases.push_back(TestCase("testing error1\n", PROCESS_OUTPUT_TYPE_OUT));
   test_cases.push_back(TestCase("testing output1\n", PROCESS_OUTPUT_TYPE_OUT));
   test_cases.push_back(TestCase("testing output2\n", PROCESS_OUTPUT_TYPE_OUT));
   test_cases.push_back(TestCase("testing output3\n", PROCESS_OUTPUT_TYPE_OUT));
   test_cases.push_back(TestCase(VeryLongString(), PROCESS_OUTPUT_TYPE_OUT));
   test_cases.push_back(TestCase("testing error2\n", PROCESS_OUTPUT_TYPE_OUT));
-  test_cases.push_back(TestCase("line with \0 in it\n",
-                                arraysize("line with \0 in it \n"),
+
+  char line_with_null_char[] = "line with \0 in it\n";
+  test_cases.push_back(TestCase(line_with_null_char,
+                                arraysize(line_with_null_char) - 1,

[oshima, 2012/04/10 00:58:12]

Maybe I'm dumb, but sorry I didn't understand why you need -1. Can you
elaborate?

[tonibarzic, 2012/04/10 01:16:59]

I don't necessary need -1, but it's more in line with the comment at line 139
(ProcessOutputWatcher will not generally be sent NULL terminated strings in
wild)

                                 PROCESS_OUTPUT_TYPE_OUT));
 
   output_watch_thread.message_loop()->PostTask(FROM_HERE,
       base::Bind(&ProcessOutputWatcherTest::StartWatch, base::Unretained(this),
                  pt_pipe[0], stop_pipe[0], test_cases));
 
   for (size_t i = 0; i < test_cases.size(); i++) {
     // Let's make inputs not NULL terminated.
     const std::string& test_str = test_cases[i].str;
     ssize_t test_size = test_str.length() * sizeof(*test_str.c_str());
     EXPECT_EQ(test_size,
               file_util::WriteFileDescriptor(pt_pipe[1], test_str.c_str(),
                                              test_size));
   }
 
   all_data_received_->Wait();
 
   // Send stop signal. It is not important which string we send.
   EXPECT_EQ(1, file_util::WriteFileDescriptor(stop_pipe[1], "q", 1));
 
   EXPECT_NE(-1, HANDLE_EINTR(close(stop_pipe[1])));
   EXPECT_NE(-1, HANDLE_EINTR(close(pt_pipe[1])));
 
   output_watch_thread.Stop();
 };