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

Side by Side Diff: third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc

Issue 2478633002: Update Crashpad to b47bf6c250c6b825dee1c5fbad9152c2c962e828 (Closed)
Patch Set: mac comment 2 Created 4 years, 1 month 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,
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 INITIALIZATION_STATE_DCHECK_VALID(initialized_); 470 INITIALIZATION_STATE_DCHECK_VALID(initialized_);
471 memcpy(uuid, &uuid_, sizeof(uuid_)); 471 memcpy(uuid, &uuid_, sizeof(uuid_));
472 } 472 }
473 473
474 bool MachOImageReader::GetCrashpadInfo( 474 bool MachOImageReader::GetCrashpadInfo(
475 process_types::CrashpadInfo* crashpad_info) const { 475 process_types::CrashpadInfo* crashpad_info) const {
476 INITIALIZATION_STATE_DCHECK_VALID(initialized_); 476 INITIALIZATION_STATE_DCHECK_VALID(initialized_);
477 477
478 mach_vm_address_t crashpad_info_address; 478 mach_vm_address_t crashpad_info_address;
479 const process_types::section* crashpad_info_section = 479 const process_types::section* crashpad_info_section =
480 GetSectionByName(SEG_DATA, "__crashpad_info", &crashpad_info_address); 480 GetSectionByName(SEG_DATA, "crashpad_info", &crashpad_info_address);
481 if (!crashpad_info_section) { 481 if (!crashpad_info_section) {
482 return false; 482 return false;
483 } 483 }
484 484
485 if (crashpad_info_section->size < 485 if (crashpad_info_section->size <
486 crashpad_info->ExpectedSize(process_reader_)) { 486 crashpad_info->ExpectedSize(process_reader_)) {
487 LOG(WARNING) << "small crashpad info section size " 487 LOG(WARNING) << "small crashpad info section size "
488 << crashpad_info_section->size << module_info_; 488 << crashpad_info_section->size << module_info_;
489 return false; 489 return false;
490 } 490 }
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 linkedit_segment, 715 linkedit_segment,
716 module_info_)) { 716 module_info_)) {
717 symbol_table_.reset(); 717 symbol_table_.reset();
718 return; 718 return;
719 } 719 }
720 720
721 symbol_table_initialized_.set_valid(); 721 symbol_table_initialized_.set_valid();
722 } 722 }
723 723
724 } // namespace crashpad 724 } // namespace crashpad
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698