commit 8c0efb8458293109af3d6c4c6c9c51f84815ec1e
author Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Fri Apr 21 10:08:14 2017 +0530
committer android-build-team Robot <android-build-team-robot@google.com> Wed Sep 13 20:22:17 2017 +0000
tree d6d49915882e5361d7128b8101b2fbc9b6f13a56
parent 1c38adbd761e25636db812f916acb03cd2e91ac8

Check For Zero Width/Height in Frame Header

Indicate error if width/height is parsed as 0.

Bug: 37561455
Test: re-ran POC without failure
Change-Id: I67245af1cd21621a3abafad3141aca109b2a4664
(cherry picked from commit 9ba62ccd598b40429e207ce3a5e4e743a35c739e)
(cherry picked from commit f0d73551ba85b90de57faa3c574a4d0a6d03677b)

decoder/impeg2d_dec_hdr.c

diff --git a/decoder/impeg2d_dec_hdr.c b/decoder/impeg2d_dec_hdr.c
index a1b61ab..77a9ac1 100644
--- a/decoder/impeg2d_dec_hdr.c
+++ b/decoder/impeg2d_dec_hdr.c
@@ -152,6 +152,12 @@
     u2_width    = impeg2d_bit_stream_get(ps_stream,12);
     u2_height   = impeg2d_bit_stream_get(ps_stream,12);
 
+    if (0 == u2_width || 0 == u2_height)
+    {
+        IMPEG2D_ERROR_CODES_T e_error = IMPEG2D_FRM_HDR_DECODE_ERR;
+        return e_error;
+    }
+
     if ((u2_width != ps_dec->u2_horizontal_size)
                     || (u2_height != ps_dec->u2_vertical_size))
     {