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

Commit f4044e89 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into...

Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5d am: 6ee73dab am: 9ef3f171 am: 8278e439 am: 093cd05c am: 05cb2d88 am: 5042d776 am: 6d1599db am: 297a8d26
am: 539826f2

* commit '539826f2':
  NuPlayerStreamListener: NULL and bounds check before memcpy
parents 5e5cdcac 539826f2
Loading
Loading
Loading
Loading
+10 −1
Original line number Original line Diff line number Diff line
@@ -144,8 +144,17 @@ ssize_t NuPlayer::NuPlayerStreamListener::read(
        copy = size;
        copy = size;
    }
    }


    if (entry->mIndex >= mBuffers.size()) {
        return ERROR_MALFORMED;
    }

    sp<IMemory> mem = mBuffers.editItemAt(entry->mIndex);
    if (mem == NULL || mem->size() < copy || mem->size() - copy < entry->mOffset) {
        return ERROR_MALFORMED;
    }

    memcpy(data,
    memcpy(data,
           (const uint8_t *)mBuffers.editItemAt(entry->mIndex)->pointer()
           (const uint8_t *)mem->pointer()
            + entry->mOffset,
            + entry->mOffset,
           copy);
           copy);