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

Commit c60a9f17 authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

Merge "Prevent out-of-bounds read" into sc-dev am: 4d1130a9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/16304601

Change-Id: I62413f9124c093bbd660ca5f6709ec1904949dac
parents 9cea5819 4d1130a9

media/libstagefright/rtsp/AAVCAssembler.cpp

+4 −0
Original line number Diff line number Diff line
@@ -295,6 +295,10 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addNALUnit( 
}



void AAVCAssembler::checkSpsUpdated(const sp<ABuffer> &buffer) {

    if (buffer->size() == 0) {

        android_errorWriteLog(0x534e4554, "204077881");

        return;

    }

    const uint8_t *data = buffer->data();

    unsigned nalType = data[0] & 0x1f;

    if (nalType == 0x7) {