commit 04b4796f70d0313f4f0edca65a1b68b1ab96206f
author Daniel Erat <derat@google.com> Thu Oct 01 05:25:50 2015 +0900
committer Qijiang Fan <fqj@google.com> Sat Jun 06 03:56:14 2020 +0900
tree f6f8169a4d4f8c0eb71011f522405bf70c890993
parent 9cd7759ac99bac86c8a643a566b66209133a7e69

Don't crash when logging if CommandLine is uninitialized.

The base::CommandLine singleton is usually initialized from
main(), but some gtest-based unit tests don't have control
over that function. Guard CommandLine accesses in
base/logging.cc to handle this gracefully.

Bug: 24536569
Change-Id: If3eab0f36c28bb6b3cf3569c61c7d7cec5cf7b10

(Reconstructed from b8c214021901c7f18bf76f1fdb4cec6e8cf8db49)

base/logging.cc

diff --git a/base/logging.cc b/base/logging.cc
index e86c6ab..156f19a 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -407,21 +407,23 @@
   // Can log only to the system debug log.
   CHECK_EQ(settings.logging_dest & ~LOG_TO_SYSTEM_DEBUG_LOG, 0);
 #endif
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  // Don't bother initializing |g_vlog_info| unless we use one of the
-  // vlog switches.
-  if (command_line->HasSwitch(switches::kV) ||
-      command_line->HasSwitch(switches::kVModule)) {
-    // NOTE: If |g_vlog_info| has already been initialized, it might be in use
-    // by another thread. Don't delete the old VLogInfo, just create a second
-    // one. We keep track of both to avoid memory leak warnings.
-    CHECK(!g_vlog_info_prev);
-    g_vlog_info_prev = g_vlog_info;
+  if (base::CommandLine::InitializedForCurrentProcess()) {
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+    // Don't bother initializing |g_vlog_info| unless we use one of the
+    // vlog switches.
+    if (command_line->HasSwitch(switches::kV) ||
+        command_line->HasSwitch(switches::kVModule)) {
+      // NOTE: If |g_vlog_info| has already been initialized, it might be in use
+      // by another thread. Don't delete the old VLogInfo, just create a second
+      // one. We keep track of both to avoid memory leak warnings.
+      CHECK(!g_vlog_info_prev);
+      g_vlog_info_prev = g_vlog_info;
 
-    g_vlog_info =
-        new VlogInfo(command_line->GetSwitchValueASCII(switches::kV),
-                     command_line->GetSwitchValueASCII(switches::kVModule),
-                     &g_min_log_level);
+      g_vlog_info =
+          new VlogInfo(command_line->GetSwitchValueASCII(switches::kV),
+                       command_line->GetSwitchValueASCII(switches::kVModule),
+                       &g_min_log_level);
+    }
   }
 
   g_logging_destination = settings.logging_dest;
@@ -776,6 +778,9 @@
     __android_log_write(priority, "chromium", str_newline.c_str());
     __android_log_write(
         priority,
+        base::CommandLine::InitializedForCurrentProcess() ?
+            base::CommandLine::ForCurrentProcess()->
+                GetProgram().BaseName().value().c_str() : nullptr,
         str_newline.c_str());
 #endif  // 0
     ignore_result(fwrite(str_newline.data(), str_newline.size(), 1, stderr));