wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return error when there are more mmco params than allocated size

Browse source 
Bug: 25818142

Change-Id: I5c1b23985eeca5192b42703c627ca3d060e4e13d
This commit is contained in:
Naveen Kumar Ponnusamy 2015-12-04 16:51:43 +05:30 • committed by Wei Jia
parent 4a524d3a8a
commit 943323f1d9
4 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
decoder/ih264d_dpb_mgr.c
View file

@ -17,6 +17,9 @@
*****************************************************************************
* Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
*/
#include "log/log.h"
#include <cutils/log.h>
#include "ih264_typedefs.h"
#include "ih264_macros.h"
#include "ih264_platform_macros.h"
@ -872,6 +875,13 @@ WORD32 ih264d_read_mmco_commands(struct _DecStruct * ps_dec)
pu4_bitstrm_buf);
while(u4_mmco != END_OF_MMCO)
{
if (j >= MAX_REF_BUFS)
{
ALOGE("b/25818142");
android_errorWriteLog(0x534e4554, "25818142");
ps_dpb_cmds->u1_num_of_commands = 0;
return -1;
}
ps_mmc_params = &ps_dpb_cmds->as_mmc_params[j];
ps_mmc_params->u4_mmco = u4_mmco;
switch(u4_mmco)

9
decoder/ih264d_parse_bslice.c
View file

@ -1581,7 +1581,14 @@ WORD32 ih264d_parse_bslice(dec_struct_t * ps_dec, UWORD16 u2_first_mb_in_slice)
if(ps_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;
}

10
decoder/ih264d_parse_islice.c
View file

@ -1374,8 +1374,14 @@ WORD32 ih264d_parse_islice(dec_struct_t *ps_dec,
if(ps_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_dec->ps_bitstrm->u4_ofst += ps_dec->u4_bitoffset;
}

9
decoder/ih264d_parse_pslice.c
View file

@ -2057,7 +2057,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;