commit b5541a002330bf4dd47f03f2b4dab58bb1392e60
author Artem Titov <titovartem@webrtc.org> Wed Oct 17 17:37:47 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Oct 18 07:40:13 2018 +0000
tree 810c3733d1e7355ccf916883035419afc58ad21e
parent 576a333876dce96ff1918e3ab67c4868267d338e

Fix: Argv may be corrupted after InitGoogleMock found any related flags

Bug: webrtc:5996
Change-Id: I42f3c7eef990e06f89d7c847b0ccc89abe257111
Reviewed-on: https://webrtc-review.googlesource.com/c/106707
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25244}

test/test_main_lib.cc

diff --git a/test/test_main_lib.cc b/test/test_main_lib.cc
index bcd0857..add24af 100644
--- a/test/test_main_lib.cc
+++ b/test/test_main_lib.cc
@@ -79,8 +79,8 @@
 
 class TestMainImpl : public TestMain {
  public:
-  int Init(int argc, char* argv[]) override {
-    ::testing::InitGoogleMock(&argc, argv);
+  int Init(int* argc, char* argv[]) override {
+    ::testing::InitGoogleMock(argc, argv);
 
     // Default to LS_INFO, even for release builds to provide better test
     // logging.
@@ -88,7 +88,7 @@
     if (rtc::LogMessage::GetLogToDebug() > rtc::LS_INFO)
       rtc::LogMessage::LogToDebug(rtc::LS_INFO);
 
-    if (rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, false)) {
+    if (rtc::FlagList::SetFlagsFromCommandLine(argc, argv, false)) {
       return 1;
     }
     if (FLAG_help) {