commit e3f2acdc204305f8234ff191d87f2ab6b3f30b5d
author Yifan Hong <elsk@google.com> Thu Jan 23 12:58:01 2020 -0800
committer Yifan Hong <elsk@google.com> Thu Jan 23 12:58:25 2020 -0800
tree 80b899fdadef63d93f650c8f24b2bf9dd57e9394
parent 20537d41cd3299bc49159613736356e6f2f88c0e

libsnapshot: fix null pointer deref

Bug: 148129196
Test: TH
Change-Id: If6a628fe1bcb3006c7a21021162488a807a7f9f7

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index 912087c..ffd94a1 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -1218,7 +1218,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;
         }