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

Commit bbc58105 authored by Sungtak Lee's avatar Sungtak Lee Committed by android-build-merger
Browse files

Merge "Handle overflow in android::HeifDataSource::readAt am: 237f9034" into pi-dev 

am: 08ce69c9

Change-Id: I631141345bd39046c44f54fe12d55342790eb7cb
parents b9108baa 08ce69c9

media/libheif/HeifDecoderImpl.cpp

+5 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ ssize_t HeifDataSource::readAt(off64_t offset, size_t size) { 
    // have been caught above.

    CHECK(offset >= mCachedOffset);



    off64_t resultOffset;

    if (__builtin_add_overflow(offset, size, &resultOffset)) {

        return ERROR_IO;

    }



    if (size == 0) {

        return 0;

    }