diff options
| author | sky <sky@chromium.org> | 2015-05-28 15:57:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-28 22:57:54 +0000 |
| commit | 675870cf282e0190ee255f3a423bd83816343f72 (patch) | |
| tree | ca42fb812eed37f581eee895f83145991efa5cb1 | |
| parent | 72983af9371683a0365706c5668c52ed49afcde4 (diff) | |
| download | chromium_src-675870cf282e0190ee255f3a423bd83816343f72.zip chromium_src-675870cf282e0190ee255f3a423bd83816343f72.tar.gz chromium_src-675870cf282e0190ee255f3a423bd83816343f72.tar.bz2 | |
Makes ApplicationTestBase correctly set argv
argv is suppose to be terminated with a null. Things like gtest rely
on this. Without it we hit an asan error when gtest tries to read
argv[argc].
BUG=none
TEST=none
R=msw@chromium.org
Review URL: https://codereview.chromium.org/1167433002
Cr-Commit-Position: refs/heads/master@{#331872}
| -rw-r--r-- | mojo/application/public/cpp/lib/application_test_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mojo/application/public/cpp/lib/application_test_base.cc b/mojo/application/public/cpp/lib/application_test_base.cc index a1bf7d9..c3289e7 100644 --- a/mojo/application/public/cpp/lib/application_test_base.cc +++ b/mojo/application/public/cpp/lib/application_test_base.cc @@ -75,7 +75,7 @@ MojoResult RunAllTests(MojoHandle application_request_handle) { int argc = 0; base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); - const char** argv = new const char* [cmd_line->argv().size()]; + const char** argv = new const char* [cmd_line->argv().size() + 1]; #if defined(OS_WIN) std::vector<std::string> local_strings; #endif @@ -87,6 +87,7 @@ MojoResult RunAllTests(MojoHandle application_request_handle) { argv[argc++] = arg.c_str(); #endif } + argv[argc] = nullptr; testing::InitGoogleTest(&argc, const_cast<char**>(&(argv[0]))); |