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

Commit ea5aa166 authored by Ray Essick's avatar Ray Essick Committed by android-build-team Robot
Browse files

Reserve enough space for RTSP CSD 

make parameters to GetSizeWidth() reflect values being used in
corresponding EncodeSize() invocations so we won't overflow the buffer.

Bug: 123701862
Test: y
Change-Id: I78596176e6042c95582494a8ae1b9c3160bf5955
(cherry picked from commit c025be8c)
parent bdd6d24f

media/libstagefright/rtsp/APacketSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ static sp<ABuffer> MakeMPEG4VideoCodecSpecificData( 
    ALOGI("VOL dimensions = %dx%d", *width, *height);



    size_t len1 = config->size() + GetSizeWidth(config->size()) + 1;

    size_t len2 = len1 + GetSizeWidth(len1) + 1 + 13;

    size_t len3 = len2 + GetSizeWidth(len2) + 1 + 3;

    size_t len2 = len1 + GetSizeWidth(len1 + 13) + 1 + 13;

    size_t len3 = len2 + GetSizeWidth(len2 + 3) + 1 + 3;



    sp<ABuffer> csd = new ABuffer(len3);

    uint8_t *dst = csd->data();