From 8854ed8f6923b489f21c553bb937e02462a00dca Mon Sep 17 00:00:00 2001 From: Venkatarama Avadhani Date: Fri, 21 Apr 2017 10:08:14 +0530 Subject: 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/decoder/impeg2d_dec_hdr.c b/decoder/impeg2d_dec_hdr.c index 9e5fc2b..27903b7 100644 --- a/decoder/impeg2d_dec_hdr.c +++ b/decoder/impeg2d_dec_hdr.c @@ -152,6 +152,12 @@ IMPEG2D_ERROR_CODES_T impeg2d_dec_seq_hdr(dec_state_t *ps_dec) 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)) { -- cgit v1.2.3