diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-05-31 16:41:49 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2016-06-01 16:00:56 +0000 |
| commit | 787b38ebb964be883088450eaa17a002d97cd2e1 (patch) | |
| tree | 6076714e93a8957034389373739de7994d7df668 /vp8/decoder/dboolhuff.c | |
| parent | 46ff1072b38fa0241738535e694a45f5c528c16e (diff) | |
| download | libvpx-787b38ebb964be883088450eaa17a002d97cd2e1.tar libvpx-787b38ebb964be883088450eaa17a002d97cd2e1.tar.gz libvpx-787b38ebb964be883088450eaa17a002d97cd2e1.tar.bz2 libvpx-787b38ebb964be883088450eaa17a002d97cd2e1.zip | |
Fix VP8 encoder UBSAN/IOC errors
1. vp8/decoder/dboolhuff.c
2. vp8/decoder/dboolhuff.h
3. vp8/encoder/bitstream.c
4. vp8/encoder/boolhuff.h
5. vp8/encoder/rdopt.c
BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1218
Change-Id: I5d315d63fd7aeaee6f3bd79178e593f3db38a6b1
Diffstat (limited to 'vp8/decoder/dboolhuff.c')
| -rw-r--r-- | vp8/decoder/dboolhuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/decoder/dboolhuff.c b/vp8/decoder/dboolhuff.c index 8a7e33205..5cdd2a249 100644 --- a/vp8/decoder/dboolhuff.c +++ b/vp8/decoder/dboolhuff.c @@ -44,7 +44,7 @@ void vp8dx_bool_decoder_fill(BOOL_DECODER *br) int shift = VP8_BD_VALUE_SIZE - CHAR_BIT - (count + CHAR_BIT); size_t bytes_left = br->user_buffer_end - bufptr; size_t bits_left = bytes_left * CHAR_BIT; - int x = (int)(shift + CHAR_BIT - bits_left); + int x = shift + CHAR_BIT - (int)bits_left; int loop_end = 0; unsigned char decrypted[sizeof(VP8_BD_VALUE) + 1]; |