crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc
Mark Mentovai 6d2d31d2d1 Use base/macros.h instead of base/basictypes.h
This was done in Chromium’s local copy of Crashpad in 562827afb599. This
change is similar to that one, except more care was taken to avoid
including headers from a .cc or _test.cc when already included by the
associated .h. Rather than using <stddef.h> for size_t, Crashpad has
always used <sys/types.h>, so that’s used here as well.

This updates mini_chromium to 8a2363f486e3a0dc562a68884832d06d28d38dcc,
which removes base/basictypes.h.

e128dcf10122 Remove base/move.h; use std::move() instead of Pass()
8a2363f486e3 Move basictypes.h to macros.h

R=avi@chromium.org

Review URL: https://codereview.chromium.org/1566713002 .
2016-01-06 12:22:50 -05:00

89 lines
2.5 KiB
C++

// 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,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "snapshot/minidump/minidump_simple_string_dictionary_reader.h"
#include <stdint.h>
#include <utility>
#include <vector>
#include "base/logging.h"
#include "minidump/minidump_extensions.h"
#include "snapshot/minidump/minidump_string_reader.h"
namespace crashpad {
namespace internal {
bool ReadMinidumpSimpleStringDictionary(
FileReaderInterface* file_reader,
const MINIDUMP_LOCATION_DESCRIPTOR& location,
std::map<std::string, std::string>* dictionary) {
if (location.Rva == 0) {
dictionary->clear();
return true;
}
if (location.DataSize < sizeof(MinidumpSimpleStringDictionary)) {
LOG(ERROR) << "simple_string_dictionary size mismatch";
return false;
}
if (!file_reader->SeekSet(location.Rva)) {
return false;
}
uint32_t entry_count;
if (!file_reader->ReadExactly(&entry_count, sizeof(entry_count))) {
return false;
}
if (location.DataSize !=
sizeof(MinidumpSimpleStringDictionary) +
entry_count * sizeof(MinidumpSimpleStringDictionaryEntry)) {
LOG(ERROR) << "simple_string_dictionary size mismatch";
return false;
}
std::vector<MinidumpSimpleStringDictionaryEntry> entries(entry_count);
if (!file_reader->ReadExactly(&entries[0],
entry_count * sizeof(entries[0]))) {
return false;
}
std::map<std::string, std::string> local_dictionary;
for (const MinidumpSimpleStringDictionaryEntry& entry : entries) {
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.insert(std::make_pair(key, value)).second) {
LOG(ERROR) << "duplicate key " << key;
return false;
}
}
dictionary->swap(local_dictionary);
return true;
}
} // namespace internal
} // namespace crashpad