Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cadcf82f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix nullptr access when cow reader open fails" am: 9e6005ad am: 9d1460be 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2325397



Change-Id: I2b462357d94ca424798490f0fc8418b0c925535f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68a88325 9d1460be

fs_mgr/libsnapshot/snapshot_writer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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))) {