Add MinidumpCrashpadInfo::report_id

client/crash_report_database_mac.mm

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 220 matching lines @@
 
 Settings* CrashReportDatabaseMac::GetSettings() {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return &settings_;
 }
 
 CrashReportDatabase::OperationStatus
 CrashReportDatabaseMac::PrepareNewCrashReport(NewReport** out_report) {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
 
+  scoped_ptr<NewReport> report(new NewReport());
+
   uuid_t uuid_gen;
   uuid_generate(uuid_gen);
-  UUID uuid(uuid_gen);
-
-  scoped_ptr<NewReport> report(new NewReport());
+  report->uuid.InitializeFromBytes(uuid_gen);
 
   report->path =
       base_dir_.Append(kWriteDirectory)
-               .Append(uuid.ToString() + "." + kCrashReportFileExtension);
+          .Append(report->uuid.ToString() + "." + kCrashReportFileExtension);
 
   report->handle = HANDLE_EINTR(open(report->path.value().c_str(),
                                      O_CREAT | O_WRONLY | O_EXCL | O_EXLOCK,
                                      0600));
   if (report->handle < 0) {
     PLOG(ERROR) << "open " << report->path.value();
     return kFileSystemError;
   }
 
   // TODO(rsesek): Potentially use an fsetxattr() here instead.
-  if (!WriteXattr(report->path, XattrName(kXattrUUID), uuid.ToString())) {
+  if (!WriteXattr(
+          report->path, XattrName(kXattrUUID), report->uuid.ToString())) {
     PLOG_IF(ERROR, IGNORE_EINTR(close(report->handle)) != 0) << "close";
     return kDatabaseError;
   }
 
   *out_report = report.release();
 
   return kNoError;
 }
 
 CrashReportDatabase::OperationStatus
@@ skipping 10 matching lines @@
   // Get the report's UUID to return.
   std::string uuid_string;
   if (ReadXattr(report->path, XattrName(kXattrUUID),
                 &uuid_string) != XattrStatus::kOK ||
       !uuid->InitializeFromString(uuid_string)) {
     LOG(ERROR) << "Failed to read UUID for crash report "
                << report->path.value();
     return kDatabaseError;
   }
 
+  if (*uuid != report->uuid) {
+    LOG(ERROR) << "UUID mismatch for crash report " << report->path.value();
+    return kDatabaseError;
+  }
+
   // Record the creation time of this report.
   if (!WriteXattrTimeT(report->path, XattrName(kXattrCreationTime),
                        time(nullptr))) {
     return kDatabaseError;
   }
 
   // Move the report to its new location for uploading.
   base::FilePath new_path =
       base_dir_.Append(kUploadPendingDirectory).Append(report->path.BaseName());
   if (rename(report->path.value().c_str(), new_path.value().c_str()) != 0) {
@@ skipping 295 matching lines @@
     const base::FilePath& path) {
   scoped_ptr<CrashReportDatabaseMac> database_mac(
       new CrashReportDatabaseMac(path));
   if (!database_mac->Initialize())
     database_mac.reset();
 
   return scoped_ptr<CrashReportDatabase>(database_mac.release());
 }
 
 }  // namespace crashpad