commit ab54dcd7a81271be10174b7b2e49fc92bb3e7982
author android-build-team Robot <android-build-team-robot@google.com> Wed May 17 07:18:15 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 17 07:18:15 2017 +0000
tree bbe387580d8170427e39eff8a5e2621a7174895c
parent 80e430870670c522afcffeba6d505e826ab97e21
parent 9c25b29d40b2215d977f2292dc63278eee2b912c

release-request-6c498b17-9310-412b-ad36-3dcf25ffef73-for-git_oc-release-4017086 snap-temp-L16500000064871237

Change-Id: Ic549ecd131d4d37d81b7f2236f1db17ec2bc6a67

decoder/impeg2d_dec_hdr.c

diff --git a/decoder/impeg2d_dec_hdr.c b/decoder/impeg2d_dec_hdr.c
index fe3c90a..c8fa447 100644
--- a/decoder/impeg2d_dec_hdr.c
+++ b/decoder/impeg2d_dec_hdr.c
@@ -153,6 +153,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))
     {