summaryrefslogtreecommitdiffstats
path: root/decoder/ih264d_parse_pslice.c
diff options
context:
space:
mode:
authorNaveen Kumar Ponnusamy <naveenkumar.p@ittiam.com>2016-01-15 02:10:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-15 02:10:55 +0000
commit64112d21e356f999c7c8e4d11fbdaee29898f931 (patch)
tree37df200592dde3692ce4b46f327ea23def5bbe43 /decoder/ih264d_parse_pslice.c
parent608fc7f4ae44cbbbef7f1b553e83751d536f6af6 (diff)
parent943323f1d9d3dd5c2634deb26cbe72343ca6b3db (diff)
downloadandroid_external_libavc-64112d21e356f999c7c8e4d11fbdaee29898f931.tar.gz
android_external_libavc-64112d21e356f999c7c8e4d11fbdaee29898f931.tar.bz2
android_external_libavc-64112d21e356f999c7c8e4d11fbdaee29898f931.zip
Return error when there are more mmco params than allocated size
am: 943323f1d9 * commit '943323f1d9d3dd5c2634deb26cbe72343ca6b3db': Return error when there are more mmco params than allocated size
Diffstat (limited to 'decoder/ih264d_parse_pslice.c')
-rw-r--r--decoder/ih264d_parse_pslice.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 4084fca..8694a36 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -2072,7 +2072,14 @@ WORD32 ih264d_parse_pslice(dec_struct_t *ps_dec, UWORD16 u2_first_mb_in_slice)
if(ps_cur_slice->u1_nal_ref_idc != 0)
{
if(!ps_dec->ps_dpb_cmds->u1_dpb_commands_read)
- ps_dec->u4_bitoffset = ih264d_read_mmco_commands(ps_dec);
+ {
+ i_temp = ih264d_read_mmco_commands(ps_dec);
+ if (i_temp < 0)
+ {
+ return ERROR_DBP_MANAGER_T;
+ }
+ ps_dec->u4_bitoffset = i_temp;
+ }
else
ps_bitstrm->u4_ofst += ps_dec->u4_bitoffset;