commit 6265e4b0ad7a0b3310fc548e37a98be45a6dd09f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 24 01:49:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 24 01:49:05 2020 +0000
tree 0819915cd2070edeeef8627ea42304286bab0e07
parent 73a22d556b26b0a5773e179d0385cf2fe4ea3ce3
parent 5a9015862c1f564a7b527ad41b4749ddc759baf9

Merge "libsnapshot: fix null pointer deref" am: f3700b9e42 am: a996f11aac am: 75e39bc646

Change-Id: I581342c005f01386fbe047ba5f798c12ed0f22a1

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index fbeb08f..88d6b8d 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -1219,7 +1219,8 @@
         if (!UnmapPartitionWithSnapshot(lock, name) || !DeleteSnapshot(lock, name)) {
             // Remember whether or not we were able to unmap the cow image.
             auto cow_image_device = GetCowImageDeviceName(name);
-            has_mapped_cow_images |= images_->IsImageMapped(cow_image_device);
+            has_mapped_cow_images |=
+                    (EnsureImageManager() && images_->IsImageMapped(cow_image_device));
 
             ok = false;
         }