Merge "Fix nullptr access when cow reader open fails" am: 9e6005ada4 am: 9d1460be06
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2325397 Change-Id: I2b462357d94ca424798490f0fc8418b0c925535f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
cadcf82fe9
1 changed files with 3 additions and 0 deletions
|
|
@ -93,6 +93,9 @@ bool CompressedSnapshotWriter::VerifyMergeOps() const noexcept {
|
|||
|
||||
std::unique_ptr<FileDescriptor> CompressedSnapshotWriter::OpenReader() {
|
||||
auto cow = OpenCowReader();
|
||||
if (cow == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
auto reader = std::make_unique<CompressedSnapshotReader>();
|
||||
if (!reader->SetCow(std::move(cow))) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue