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

Decoder: Fix integer sanitizer issues in ih264d_parse_cabac

Browse source 
Bug: 118445723
Test: vendor
Change-Id: Icf98785fa474bd9c774ba4282b9c3d73360a69ea
This commit is contained in:
Isha Shrikant Kulkarni 2019-01-11 12:09:22 +05:30 • committed by Ray Essick
parent fc7139a53e
commit 96f7193ba0
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
decoder/ih264d_defs.h
View file

@ -600,7 +600,7 @@ enum
#endif //DEBLOCK_THREAD
#define NUM_COEFFS_IN_4x4BLK 16
#define CABAC_BITS_TO_READ 23
#define MEMSET_16BYTES(pu4_start,value) \
{ \

18
decoder/ih264d_parse_cabac.c
View file

@ -400,7 +400,7 @@ UWORD8 ih264d_read_coeff4x4_cabac(dec_bit_stream_t *ps_bitstrm,
{
UWORD32 uc_bin;
UWORD32 bits_to_flush;
UWORD32 max_bits = 32;
bits_to_flush = 0;
/*renormalize to ensure there 23 bits more in the u4_code_int_val_ofst*/
@ -409,7 +409,7 @@ UWORD8 ih264d_read_coeff4x4_cabac(dec_bit_stream_t *ps_bitstrm,
u4_clz = CLZ(u4_code_int_range);
FLUSHBITS(u4_offset, u4_clz)
NEXTBITS(read_bits, u4_offset, pu4_buffer, 23)
NEXTBITS(read_bits, u4_offset, pu4_buffer, CABAC_BITS_TO_READ)
u4_code_int_range = u4_code_int_range << u4_clz;
u4_code_int_val_ofst = (u4_code_int_val_ofst
<< u4_clz) | read_bits;
@ -438,7 +438,7 @@ UWORD8 ih264d_read_coeff4x4_cabac(dec_bit_stream_t *ps_bitstrm,
ps_cab_env);INC_BYPASS_BINS(ps_cab_env);
}
while(uc_bin && (bits_to_flush < max_bits));
while(uc_bin && (bits_to_flush < CABAC_BITS_TO_READ));
u4_value = (bits_to_flush - 1);
@ -459,7 +459,7 @@ UWORD8 ih264d_read_coeff4x4_cabac(dec_bit_stream_t *ps_bitstrm,
u4_clz = CLZ(u4_code_int_range);
FLUSHBITS(u4_offset, u4_clz)
NEXTBITS(read_bits, u4_offset, pu4_buffer, 23)
NEXTBITS(read_bits, u4_offset, pu4_buffer, CABAC_BITS_TO_READ)
u4_code_int_range = u4_code_int_range << u4_clz;
u4_code_int_val_ofst = (u4_code_int_val_ofst
<< u4_clz) | read_bits;
@ -868,7 +868,7 @@ void ih264d_read_coeff8x8_cabac(dec_bit_stream_t *ps_bitstrm,
{
UWORD32 uc_bin;
UWORD32 bits_to_flush;
UWORD32 max_bits = 32;
bits_to_flush = 0;
/*renormalize to ensure there 23 bits more in the u4_code_int_val_ofst*/
@ -877,7 +877,7 @@ void ih264d_read_coeff8x8_cabac(dec_bit_stream_t *ps_bitstrm,
u4_clz = CLZ(u4_code_int_range);
FLUSHBITS(u4_offset, u4_clz)
NEXTBITS(read_bits, u4_offset, pu4_buffer, 23)
NEXTBITS(read_bits, u4_offset, pu4_buffer, CABAC_BITS_TO_READ)
u4_code_int_range = u4_code_int_range << u4_clz;
u4_code_int_val_ofst = (u4_code_int_val_ofst
<< u4_clz) | read_bits;
@ -902,7 +902,7 @@ void ih264d_read_coeff8x8_cabac(dec_bit_stream_t *ps_bitstrm,
}
}
while(uc_bin && (bits_to_flush < max_bits));
while(uc_bin && (bits_to_flush < CABAC_BITS_TO_READ));
u4_value = (bits_to_flush - 1);
}
@ -921,7 +921,7 @@ void ih264d_read_coeff8x8_cabac(dec_bit_stream_t *ps_bitstrm,
u4_clz = CLZ(u4_code_int_range);
FLUSHBITS(u4_offset, u4_clz)
NEXTBITS(read_bits, u4_offset, pu4_buffer, 23)
NEXTBITS(read_bits, u4_offset, pu4_buffer, CABAC_BITS_TO_READ)
u4_code_int_range = u4_code_int_range << u4_clz;
u4_code_int_val_ofst = (u4_code_int_val_ofst
<< u4_clz) | read_bits;
@ -967,7 +967,7 @@ void ih264d_read_coeff8x8_cabac(dec_bit_stream_t *ps_bitstrm,
//Value of K
ui16_sufS += u4_value;
i2_abs_lvl += ui16_sufS;
i2_abs_lvl += (WORD32)ui16_sufS;
}
else
{