| OLD | NEW |
| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 return address_; | 45 return address_; |
| 46 } | 46 } |
| 47 | 47 |
| 48 size_t MemorySnapshotMac::Size() const { | 48 size_t MemorySnapshotMac::Size() const { |
| 49 INITIALIZATION_STATE_DCHECK_VALID(initialized_); | 49 INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| 50 return size_; | 50 return size_; |
| 51 } | 51 } |
| 52 | 52 |
| 53 bool MemorySnapshotMac::Read(Delegate* delegate) const { | 53 bool MemorySnapshotMac::Read(Delegate* delegate) const { |
| 54 INITIALIZATION_STATE_DCHECK_VALID(initialized_); | 54 INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| 55 |
| 56 if (size_ == 0) { |
| 57 return delegate->MemorySnapshotDelegateRead(nullptr, size_); |
| 58 } |
| 59 |
| 55 scoped_ptr<uint8_t[]> buffer(new uint8_t[size_]); | 60 scoped_ptr<uint8_t[]> buffer(new uint8_t[size_]); |
| 56 if (!process_reader_->Memory()->Read(address_, size_, buffer.get())) { | 61 if (!process_reader_->Memory()->Read(address_, size_, buffer.get())) { |
| 57 return false; | 62 return false; |
| 58 } | 63 } |
| 59 return delegate->MemorySnapshotDelegateRead(buffer.get(), size_); | 64 return delegate->MemorySnapshotDelegateRead(buffer.get(), size_); |
| 60 } | 65 } |
| 61 | 66 |
| 62 } // namespace internal | 67 } // namespace internal |
| 63 } // namespace crashpad | 68 } // namespace crashpad |
| OLD | NEW |