diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:14:58 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:14:58 -0800 |
commit | 68b16a3e8f6f0e4fdc089c9aab5eaa7fb809dd0e (patch) | |
tree | 37df200592dde3692ce4b46f327ea23def5bbe43 /decoder/ih264d_dpb_mgr.c | |
parent | cccc2b85cd9759336fd66db717f5c9f0363cc462 (diff) | |
parent | 64112d21e356f999c7c8e4d11fbdaee29898f931 (diff) | |
download | android_external_libavc-staging/cm-13.0+r22.tar.gz android_external_libavc-staging/cm-13.0+r22.tar.bz2 android_external_libavc-staging/cm-13.0+r22.zip |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/external/libavc into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
Diffstat (limited to 'decoder/ih264d_dpb_mgr.c')
-rw-r--r-- | decoder/ih264d_dpb_mgr.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c index 205bc9b..7c4305b 100644 --- a/decoder/ih264d_dpb_mgr.c +++ b/decoder/ih264d_dpb_mgr.c @@ -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) |