Allow duplicate attachments for cloned/nested scopes

Author: jpnurmi

handler/linux/crash_report_exception_handler.cc

@@ -212,22 +212,17 @@ bool CrashReportExceptionHandler::HandleExceptionWithConnection(
 
 void CrashReportExceptionHandler::AddAttachment(
     const base::FilePath& attachment) {
-  auto it = std::find(attachments_.begin(), attachments_.end(), attachment);
-  if (it != attachments_.end()) {
-    LOG(WARNING) << "ignoring duplicate attachment " << attachment;
-    return;
-  }
   attachments_.push_back(attachment);
 }
 
 void CrashReportExceptionHandler::RemoveAttachment(
     const base::FilePath& attachment) {
-  auto it = std::find(attachments_.begin(), attachments_.end(), attachment);
-  if (it == attachments_.end()) {
-    LOG(WARNING) << "ignoring non-existent attachment " << attachment;
+  auto it = std::find(attachments_.rbegin(), attachments_.rend(), attachment);
+  if (it == attachments_.rend()) {
+    LOG(WARNING) << "no such attachment " << attachment;
     return;
   }
-  attachments_.erase(it);
+  attachments_.erase(std::next(it).base());
 }
 
 bool CrashReportExceptionHandler::WriteMinidumpToDatabase(
@@ -272,7 +267,12 @@ bool CrashReportExceptionHandler::WriteMinidumpToDatabase(
     }
   }
 
+  std::set<base::FilePath> added_attachments;
   for (const auto& attachment : attachments_) {
+    if (!added_attachments.insert(attachment).second) {
+      continue;
+    }
+
     FileReader file_reader;
     if (!file_reader.Open(attachment)) {
       LOG(ERROR) << "attachment " << attachment.value().c_str()

handler/win/crash_report_exception_handler.cc

@@ -115,7 +115,12 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
       return termination_code;
     }
 
+    std::set<base::FilePath> added_attachments;
     for (const auto& attachment : attachments_) {
+      if (!added_attachments.insert(attachment).second) {
+        continue;
+      }
+
       FileReader file_reader;
       if (!file_reader.Open(attachment)) {
         LOG(ERROR) << "attachment " << attachment
@@ -170,22 +175,17 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
 
 void CrashReportExceptionHandler::ExceptionHandlerServerAttachmentAdded(
     const base::FilePath& attachment) {
-  auto it = std::find(attachments_.begin(), attachments_.end(), attachment);
-  if (it != attachments_.end()) {
-    LOG(WARNING) << "ignoring duplicate attachment " << attachment;
-    return;
-  }
   attachments_.push_back(attachment);
 }
 
 void CrashReportExceptionHandler::ExceptionHandlerServerAttachmentRemoved(
     const base::FilePath& attachment) {
-  auto it = std::find(attachments_.begin(), attachments_.end(), attachment);
-  if (it == attachments_.end()) {
-    LOG(WARNING) << "ignoring non-existent attachment " << attachment;
+  auto it = std::find(attachments_.rbegin(), attachments_.rend(), attachment);
+  if (it == attachments_.rend()) {
+    LOG(WARNING) << "no such attachment " << attachment;
     return;
   }
-  attachments_.erase(it);
+  attachments_.erase(std::next(it).base());
 }
 
 }  // namespace crashpad