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

Commit 3f7eacaa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect NULL check in IncFsFileMap reference assertions" into... 

Merge "Fix incorrect NULL check in IncFsFileMap reference assertions" into main am: 2576ad70 am: 67fc5833

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3526790



Change-Id: I265c6c114f74e1b9b6e40edc30b7f5cfb8b3bc27
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4442e642 67fc5833

libs/androidfw/Asset.cpp

+2 −2
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ status_t _FileAsset::openChunk(incfs::IncFsFileMap&& dataMap, base::unique_fd fd 
{

    assert(mFp == NULL);    // no reopen

    assert(!mMap.has_value());

    assert(dataMap != NULL);

    assert(dataMap.data());



    mMap = std::move(dataMap);

    mStart = -1;            // not used
@@ -798,7 +798,7 @@ status_t _CompressedAsset::openChunk(incfs::IncFsFileMap&& dataMap, size_t uncom 
{

    assert(mFd < 0);        // no re-open

    assert(!mMap.has_value());

    assert(dataMap != NULL);

    assert(dataMap.data());



    mMap = std::move(dataMap);

    mStart = -1;        // not used