commit 07ef2602d119ca1acab51bb7396421bf046cdc92
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 02 21:18:24 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 02 21:18:24 2022 +0000
tree bc4ea9f9650638d2fe830f83571f2ae9ee1c460f
parent aedb9a8e48674c084e4fdd062dc079599f7ac468
parent cadcf82fe91b2bd51eb5ac89129295004e1d6a4f

Merge "Fix nullptr access when cow reader open fails" am: 9e6005ada4 am: 9d1460be06 am: cadcf82fe9

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

Change-Id: Ie300c9cbd6d5b43c6cb458f325d6b0160e61fcf3
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))) {