Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: minidump/minidump_module_writer.cc

Issue 983103004: win: fixes for Windows x64 (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: mac Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "minidump/minidump_module_writer.h" 15 #include "minidump/minidump_module_writer.h"
16 16
17 #include <sys/types.h> 17 #include <sys/types.h>
18 18
19 #include <limits> 19 #include <limits>
20 20
21 #include "base/logging.h" 21 #include "base/logging.h"
22 #include "base/numerics/safe_conversions.h"
22 #include "minidump/minidump_string_writer.h" 23 #include "minidump/minidump_string_writer.h"
23 #include "minidump/minidump_writer_util.h" 24 #include "minidump/minidump_writer_util.h"
24 #include "snapshot/module_snapshot.h" 25 #include "snapshot/module_snapshot.h"
25 #include "util/file/file_writer.h" 26 #include "util/file/file_writer.h"
26 #include "util/numeric/in_range_cast.h" 27 #include "util/numeric/in_range_cast.h"
27 #include "util/numeric/safe_assignment.h" 28 #include "util/numeric/safe_assignment.h"
28 29
29 namespace crashpad { 30 namespace crashpad {
30 31
31 MinidumpModuleCodeViewRecordWriter::~MinidumpModuleCodeViewRecordWriter() { 32 MinidumpModuleCodeViewRecordWriter::~MinidumpModuleCodeViewRecordWriter() {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 bool MinidumpModuleMiscDebugRecordWriter::Freeze() { 148 bool MinidumpModuleMiscDebugRecordWriter::Freeze() {
148 DCHECK_EQ(state(), kStateMutable); 149 DCHECK_EQ(state(), kStateMutable);
149 150
150 if (!MinidumpWritable::Freeze()) { 151 if (!MinidumpWritable::Freeze()) {
151 return false; 152 return false;
152 } 153 }
153 154
154 // NUL-terminate. 155 // NUL-terminate.
155 if (!image_debug_misc_.Unicode) { 156 if (!image_debug_misc_.Unicode) {
156 DCHECK(data_utf16_.empty()); 157 DCHECK(data_utf16_.empty());
157 image_debug_misc_.Length = offsetof(decltype(image_debug_misc_), Data) + 158 image_debug_misc_.Length = base::checked_cast<uint32_t>(
158 (data_.size() + 1) * sizeof(data_[0]); 159 offsetof(decltype(image_debug_misc_), Data) +
160 (data_.size() + 1) * sizeof(data_[0]));
159 } else { 161 } else {
160 DCHECK(data_.empty()); 162 DCHECK(data_.empty());
161 image_debug_misc_.Length = 163 image_debug_misc_.Length = base::checked_cast<uint32_t>(
162 offsetof(decltype(image_debug_misc_), Data) + 164 offsetof(decltype(image_debug_misc_), Data) +
163 (data_utf16_.size() + 1) * sizeof(data_utf16_[0]); 165 (data_utf16_.size() + 1) * sizeof(data_utf16_[0]));
164 } 166 }
165 167
166 return true; 168 return true;
167 } 169 }
168 170
169 size_t MinidumpModuleMiscDebugRecordWriter::SizeOfObject() { 171 size_t MinidumpModuleMiscDebugRecordWriter::SizeOfObject() {
170 DCHECK_GE(state(), kStateFrozen); 172 DCHECK_GE(state(), kStateFrozen);
171 173
172 return image_debug_misc_.Length; 174 return image_debug_misc_.Length;
173 } 175 }
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 } 450 }
449 451
450 return file_writer->WriteIoVec(&iovecs); 452 return file_writer->WriteIoVec(&iovecs);
451 } 453 }
452 454
453 MinidumpStreamType MinidumpModuleListWriter::StreamType() const { 455 MinidumpStreamType MinidumpModuleListWriter::StreamType() const {
454 return kMinidumpStreamTypeModuleList; 456 return kMinidumpStreamTypeModuleList;
455 } 457 }
456 458
457 } // namespace crashpad 459 } // namespace crashpad
OLDNEW
« no previous file with comments | « minidump/minidump_module_crashpad_info_writer_test.cc ('k') | minidump/minidump_simple_string_dictionary_writer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698