| OLD | NEW |
| 1 // Copyright 2014 Google Inc. All Rights Reserved. | 1 // Copyright 2014 Google Inc. 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 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 reinterpret_cast<const char*>(shadow->page_bits() + index_min), length); | 654 reinterpret_cast<const char*>(shadow->page_bits() + index_min), length); |
| 655 } | 655 } |
| 656 } | 656 } |
| 657 | 657 |
| 658 void PopulateAsanParameters(const AsanErrorInfo& error_info, | 658 void PopulateAsanParameters(const AsanErrorInfo& error_info, |
| 659 crashdata::Dictionary* dict) { | 659 crashdata::Dictionary* dict) { |
| 660 DCHECK_NE(static_cast<crashdata::Dictionary*>(nullptr), dict); | 660 DCHECK_NE(static_cast<crashdata::Dictionary*>(nullptr), dict); |
| 661 | 661 |
| 662 // Any new parameter added to the parameters structure should also be added | 662 // Any new parameter added to the parameters structure should also be added |
| 663 // here. | 663 // here. |
| 664 static_assert(14 == ::common::kAsanParametersVersion, | 664 static_assert(15 == ::common::kAsanParametersVersion, |
| 665 "Pointers in the params must be linked up here."); | 665 "Pointers in the params must be linked up here."); |
| 666 crashdata::Dictionary* param_dict = crashdata::DictAddDict("asan-parameters", | 666 crashdata::Dictionary* param_dict = crashdata::DictAddDict("asan-parameters", |
| 667 dict); | 667 dict); |
| 668 DCHECK_NE(static_cast<crashdata::Dictionary*>(nullptr), param_dict); | 668 DCHECK_NE(static_cast<crashdata::Dictionary*>(nullptr), param_dict); |
| 669 crashdata::LeafSetUInt(error_info.asan_parameters.quarantine_size, | 669 crashdata::LeafSetUInt(error_info.asan_parameters.quarantine_size, |
| 670 crashdata::DictAddLeaf("quarantine-size", param_dict)); | 670 crashdata::DictAddLeaf("quarantine-size", param_dict)); |
| 671 crashdata::LeafSetUInt(error_info.asan_parameters.trailer_padding_size, | 671 crashdata::LeafSetUInt(error_info.asan_parameters.trailer_padding_size, |
| 672 crashdata::DictAddLeaf("trailer-padding-size", | 672 crashdata::DictAddLeaf("trailer-padding-size", |
| 673 param_dict)); | 673 param_dict)); |
| 674 crashdata::LeafSetUInt(error_info.asan_parameters.quarantine_block_size, | 674 crashdata::LeafSetUInt(error_info.asan_parameters.quarantine_block_size, |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 821 NOTREACHED() << "Unexpected dictionary entry."; | 821 NOTREACHED() << "Unexpected dictionary entry."; |
| 822 } | 822 } |
| 823 } else { | 823 } else { |
| 824 NOTREACHED() << "Unexpected entry."; | 824 NOTREACHED() << "Unexpected entry."; |
| 825 } | 825 } |
| 826 } | 826 } |
| 827 } | 827 } |
| 828 | 828 |
| 829 } // namespace asan | 829 } // namespace asan |
| 830 } // namespace agent | 830 } // namespace agent |
| OLD | NEW |