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

Commit 69b28f6b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [9200581, 9200376, 9200474, 9200583, 9200491, 9200584,... 

Merge cherrypicks of [9200581, 9200376, 9200474, 9200583, 9200491, 9200584, 9200505, 9200585, 9200475, 9200586, 9200476, 9200588, 9200589, 9200639] into qt-release

Change-Id: Ib1cc063d128c37ba9b399de42c52d532c8db6e25
parents cee606de 5af096cb

media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1355,6 +1355,14 @@ PV_STATUS DecodeShortHeader(VideoDecData *video, Vop *currVop) 
            int tmpHeight = (tmpDisplayHeight + 15) & -16;

            int tmpWidth = (tmpDisplayWidth + 15) & -16;



            if (tmpWidth > video->width)

            {

                // while allowed by the spec, this decoder does not actually

                // support an increase in size.

                ALOGE("width increase not supported");

                status = PV_FAIL;

                goto return_point;

            }

            if (tmpHeight * tmpWidth > video->size)

            {

                // This is just possibly "b/37079296".