commit cadcf82fe91b2bd51eb5ac89129295004e1d6a4f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 02 20:39:06 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 02 20:39:06 2022 +0000
tree 6c0755ad3b0aadada93ee81d61f99f70b7f0ce58
parent 68a88325c667891fe15db7aef1a58ef879a7cafc
parent 9d1460be060ddc25aacff82dc7630fa626c615d0

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>

fs_mgr/libsnapshot/snapshot_writer.cpp

diff --git a/fs_mgr/libsnapshot/snapshot_writer.cpp b/fs_mgr/libsnapshot/snapshot_writer.cpp
index 6aad3d1..82a7fd7 100644
--- a/fs_mgr/libsnapshot/snapshot_writer.cpp
+++ b/fs_mgr/libsnapshot/snapshot_writer.cpp
@@ -93,6 +93,9 @@
 
 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))) {