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

Commit 2576ad70 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents d5c28dd7 7ac48df1

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