diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-27 13:37:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-05 23:48:52 +0100 |
| commit | d3de02d9d44256dd2b5c5239bdb2f3830ba8da44 (patch) | |
| tree | ed40bcf67b16fa3c97c0a837770e77da58ef8d86 /libavcodec/h264_slice.c | |
| parent | cc80478463dd1816836ffd2b8b92f4daa957021d (diff) | |
| download | ffmpeg-d3de02d9d44256dd2b5c5239bdb2f3830ba8da44.tar.gz | |
avcodec/cabac: Check initial cabac decoder state
Fixes integer overflows
Fixes: 1430e9c43fae47a24c179c7c54f94918/signal_sigsegv_421427_2340_591e9810c7b09efe501ad84638c9e9f8.264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Found-by: xiedingbao (Ticket4727)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8000d484b83aafa752d84fbdbfb352ffe0dc64f8)
Conflicts:
libavcodec/cabac.h
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_slice.c
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 5de2fcda68..57a135efc6 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -2442,13 +2442,16 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) } if (h->pps.cabac) { + int ret; /* realign */ align_get_bits(&h->gb); /* init cabac */ - ff_init_cabac_decoder(&h->cabac, + ret = ff_init_cabac_decoder(&h->cabac, h->gb.buffer + get_bits_count(&h->gb) / 8, (get_bits_left(&h->gb) + 7) / 8); + if (ret < 0) + return ret; ff_h264_init_cabac_states(h); |