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

Commit 67fc5833 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 main am: 2576ad70 

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



Change-Id: I2f70c06fa238003ba8e97bf5c469ef4d872857a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b4bce34 2576ad70

libs/androidfw/Asset.cpp

+2 −2
Original line number Original line 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(mFp == NULL);    // no reopen

    assert(!mMap.has_value());

    assert(!mMap.has_value());

    assert(dataMap != NULL);

    assert(dataMap.data());





    mMap = std::move(dataMap);

    mMap = std::move(dataMap);

    mStart = -1;            // not used

    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(mFd < 0);        // no re-open

    assert(!mMap.has_value());

    assert(!mMap.has_value());

    assert(dataMap != NULL);

    assert(dataMap.data());





    mMap = std::move(dataMap);

    mMap = std::move(dataMap);

    mStart = -1;        // not used

    mStart = -1;        // not used