Roll breakpad r1454:r1456 and add product info in microdumps

components/crash/app/breakpad_linux.cc

 // Copyright 2013 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.
 
 // For linux_syscall_support.h. This makes it safe to call embedded system
 // calls when in seccomp mode.
 
 #include "components/crash/app/breakpad_linux.h"
 
 #include <fcntl.h>
@@ skipping 71 matching lines @@
 const char kUploadURL[] = "https://clients2.google.com/cr/report";
 #endif
 
 bool g_is_crash_reporter_enabled = false;
 uint64_t g_process_start_time = 0;
 pid_t g_pid = 0;
 char* g_crash_log_path = NULL;
 ExceptionHandler* g_breakpad = NULL;
 ExceptionHandler* g_microdump = NULL;
 
+std::string g_microdump_build_fingerprint;

[Lei Zhang, 2015/05/14 19:14:26]

Mark these Android only?

[Lei Zhang, 2015/05/14 19:14:27]

Won't this and |g_microdump_product_info| add static initializers, and thus fail
the "size" step on the buildbot?

[Primiano Tucci (use gerrit), 2015/05/15 10:20:28]

Facepalm, right. switched to lazy_instance with no static initializers (linker
initialized in the bss).

[Primiano Tucci (use gerrit), 2015/05/15 10:20:28]

Done.

+const char* g_c_microdump_build_fingerprint = NULL;

[Lei Zhang, 2015/05/14 19:14:27]

Let's start using nullptr in new code.

[Primiano Tucci (use gerrit), 2015/05/15 10:20:27]

If you are fine with that, I did mass s/NULL/nullptr/ in this file. Felt a bit
weird to me to have a mixture.
In the contrary case, I'll just delete PatchSet 4 (which has just the s///).

+
+std::string g_microdump_product_info;
+const char* g_c_microdump_product_info = NULL;
+
 #if defined(ADDRESS_SANITIZER)
 const char* g_asan_report_str = NULL;
 #endif
 #if defined(OS_ANDROID)
 char* g_process_type = NULL;
 #endif
 
 CrashKeyStorage* g_crash_keys = NULL;
 
 // Writes the value |v| as 16 hex characters to the memory pointed at by
@@ skipping 620 matching lines @@
   // TODO(primiano): For the moment microdumps are enabled only on arm (32/64).
   // Extend support to other architectures (requires some breakpad changes).
   return;
 #endif
 
   if (!GetCrashReporterClient()->ShouldEnableBreakpadMicrodumps())
     return;
 
   VLOG(1) << "Enabling microdumps crash handler (process_type:"
           << process_type << ")";
+
+  const char* product_name = NULL;
+  const char* product_version = NULL;
+  GetCrashReporterClient()->GetProductNameAndVersion(&product_name,
+                                                     &product_version);
+  g_microdump_product_info = product_name + string(":") + product_version;
+  g_microdump_build_fingerprint =
+      base::android::BuildInfo::GetInstance()->android_build_fp();
+
+  // The exception handler runs in a compromised context and cannot use c_str()
+  // as that would require the heap. Therefore, we have to guarantee that the
+  // build fingerprint and product info pointers are always valid.
+  g_c_microdump_product_info = g_microdump_product_info.c_str();
+  g_c_microdump_build_fingerprint = g_microdump_build_fingerprint.c_str();
+
+  MinidumpDescriptor descriptor(MinidumpDescriptor::kMicrodumpOnConsole);
+  descriptor.SetMicrodumpProductInfo(g_c_microdump_product_info);
+  descriptor.SetMicrodumpBuildFingerprint(g_c_microdump_build_fingerprint);
+
   DCHECK(!g_microdump);
   bool is_browser_process = process_type.empty() || process_type == "webview";
   g_microdump = new ExceptionHandler(
-        MinidumpDescriptor(MinidumpDescriptor::kMicrodumpOnConsole),
+        descriptor,
         NULL,
         MicrodumpCrashDone,
         reinterpret_cast<void*>(is_browser_process),
         true,  // Install handlers.
         -1);   // Server file descriptor. -1 for in-process.
     return;
 }
 
 bool CrashDoneInProcessNoUpload(
     const google_breakpad::MinidumpDescriptor& descriptor,
@@ skipping 962 matching lines @@
     }
   }
 }
 #endif  // OS_ANDROID
 
 bool IsCrashReporterEnabled() {
   return g_is_crash_reporter_enabled;
 }
 
 }  // namespace breakpad