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

Commit 91188c13 authored by Harish Mahendrakar's avatar Harish Mahendrakar Committed by Vasyl Gello
Browse files

m4v_h263: Return error for zero width and height 

Test: poc in bug
Bug: 152496149
Bug: 152629190

Change-Id: I07293e97b664e03e29a1392b139132fc137361cd
(cherry picked from commit 5d8def9a)
parent a955a9de

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

+6 −2
Original line number Diff line number Diff line
@@ -409,7 +409,9 @@ decode_vol: 
        if (!BitstreamRead1Bits(stream)) return PV_FAIL;



        /* video_object_layer_width (13 bits) */

        video->displayWidth = video->width = (int) BitstreamReadBits16(stream, 13);

        tmpvar = BitstreamReadBits16(stream, 13);

        if (!tmpvar) return PV_FAIL;

        video->displayWidth = video->width = tmpvar;



        /* round up to a multiple of MB_SIZE.   08/09/2000 */

        video->width = (video->width + 15) & -16;
@@ -419,7 +421,9 @@ decode_vol: 
        if (!BitstreamRead1Bits(stream)) return PV_FAIL;



        /* video_object_layer_height (13 bits) */

        video->displayHeight = video->height = (int) BitstreamReadBits16(stream, 13);

        tmpvar = BitstreamReadBits16(stream, 13);

        if (!tmpvar) return PV_FAIL;

        video->displayHeight = video->height = tmpvar;



        /* round up to a multiple of MB_SIZE.   08/09/2000 */

        video->height = (video->height + 15) & -16;