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

Commit 3d0f195b authored by George Burgess IV's avatar George Burgess IV Committed by Gerrit Code Review
Browse files

Merge "fs_mgr: fix potential uses of nullptr"

parents 99ed2152 1c8d814c

fs_mgr/fs_mgr_overlayfs.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ static bool CreateDynamicScratch(std::string* scratch_device, bool* partition_ex 


static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exists, bool* change) {

    *partition_exists = false;

    *change = false;

    if (change) *change = false;



    auto images = IImageManager::Open("remount", 10s);

    if (!images) {
@@ -1117,7 +1117,7 @@ static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exi 
        return false;

    }



    *change = true;

    if (change) *change = true;



    // Note: calling RemoveDisabledImages here ensures that we do not race with

    // clean_scratch_files and accidentally try to map an image that will be