diff options
| author | Michael Niedermayer <[email protected]> | 2017-11-05 21:20:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2018-01-31 22:56:14 +0100 |
| commit | 7de06077c9fb2e85fbcb48929ff118662d242ca3 (patch) | |
| tree | 0e803bfe7ebb63d05376884e9423df798bf9807c | |
| parent | d8fb143546da2142e21a845a3d493d200267b8ec (diff) | |
avcodec/snowdec: Fix integer overflow in header parsing
Fixes: 3984/clusterfuzz-testcase-minimized-5265759929368576
Fixes: runtime error: signed integer overflow: -1085585801 + -1094995529 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit c897a9285846b6a072b9650976afd4f091b7a71f)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/snowdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 8c30a52813..88cee3e872 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -371,7 +371,7 @@ static int decode_header(SnowContext *s){ } } - s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1); + s->spatial_decomposition_type+= (unsigned)get_symbol(&s->c, s->header_state, 1); if(s->spatial_decomposition_type > 1U){ av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_type %d not supported\n", s->spatial_decomposition_type); return AVERROR_INVALIDDATA; @@ -387,10 +387,10 @@ static int decode_header(SnowContext *s){ } - s->qlog += get_symbol(&s->c, s->header_state, 1); - s->mv_scale += get_symbol(&s->c, s->header_state, 1); - s->qbias += get_symbol(&s->c, s->header_state, 1); - s->block_max_depth+= get_symbol(&s->c, s->header_state, 1); + s->qlog += (unsigned)get_symbol(&s->c, s->header_state, 1); + s->mv_scale += (unsigned)get_symbol(&s->c, s->header_state, 1); + s->qbias += (unsigned)get_symbol(&s->c, s->header_state, 1); + s->block_max_depth+= (unsigned)get_symbol(&s->c, s->header_state, 1); if(s->block_max_depth > 1 || s->block_max_depth < 0 || s->mv_scale > 256U){ av_log(s->avctx, AV_LOG_ERROR, "block_max_depth= %d is too large\n", s->block_max_depth); s->block_max_depth= 0; |