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

Commit 40a3ef41 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge tag 'android-10.0.0_r4' into HEAD 

Android 10.0.0 Release 4 (QP1A.191005.007)

* tag 'android-10.0.0_r4':
  Fix OOB access in mpeg4/h263 decoder

Change-Id: I6b92d824f8e61caeb247bac9d7062af2120639a8
parents 926588c7 69b28f6b

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".