Improve map insertions

snapshot/minidump/minidump_simple_string_dictionary_reader.cc

 // 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 54 matching lines @@
     std::string key;
     if (!ReadMinidumpUTF8String(file_reader, entry.key, &key)) {
       return false;
     }
 
     std::string value;
     if (!ReadMinidumpUTF8String(file_reader, entry.value, &value)) {
       return false;
     }
 
-    if (local_dictionary.find(key) != local_dictionary.end()) {
-      LOG(WARNING) << "duplicate key " << key << ", discarding value " << value;
+    if (!local_dictionary.insert(std::make_pair(key, value)).second) {
+      LOG(ERROR) << "duplicate key " << key;

[scottmg, 2015/03/31 18:16:15]

log level change was intentional?

[Mark Mentovai, 2015/03/31 18:21:32]

scottmg wrote:
Yeah, this used to not cause the function to fail, but it changed along the way
(https://codereview.chromium.org/972383002/diff/60001/snapshot/minidump/minidu...).
The log message never got updated to match.

       return false;
     }
-
-    local_dictionary.insert(std::make_pair(key, value));
   }
 
   dictionary->swap(local_dictionary);
   return true;
 }
 
 }  // namespace internal
 }  // namespace crashpad