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

Commit a996f11a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "libsnapshot: fix null pointer deref" am: f3700b9e 

Change-Id: I5c21edc690f3ea5e428f6ea0e1cae6f6c979e63d
parents a554e966 f3700b9e

fs_mgr/libsnapshot/snapshot.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,8 @@ bool SnapshotManager::RemoveAllSnapshots(LockedFile* lock) { 
        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;

        }