Merge "Check for Valid Frame Rate in Header" into mnc-dev am: 340963d160 am: b017bd365f am: 3813c97a7f am: 76ea7ee0f1 am: 86fffa7349 am: 44f4d18fcc am: af6adb0702
am: f2ad7a400d
Change-Id: Ibf3deb05ead0d74531ade70fad439d6c55ffb2ab
diff --git a/decoder/impeg2d_dec_hdr.c b/decoder/impeg2d_dec_hdr.c
index 0d148a1..459eaaa 100644
--- a/decoder/impeg2d_dec_hdr.c
+++ b/decoder/impeg2d_dec_hdr.c
@@ -45,6 +45,10 @@
#include "impeg2d_deinterlace.h"
+/*****************************************************************************
+* MPEG2 Constants for Parse Check
+******************************************************************************/
+#define MPEG2_MAX_FRAME_RATE_CODE 8
/******************************************************************************
* Function Name : impeg2d_next_start_code
@@ -200,6 +204,10 @@
/* Frame rate code(4 bits) */
/*------------------------------------------------------------------------*/
ps_dec->u2_frame_rate_code = impeg2d_bit_stream_get(ps_stream,4);
+ if (ps_dec->u2_frame_rate_code > MPEG2_MAX_FRAME_RATE_CODE)
+ {
+ return IMPEG2D_FRM_HDR_DECODE_ERR;
+ }
/*------------------------------------------------------------------------*/
/* Flush the following as they are not being used */
/* bit_rate_value (18 bits) */
