Browse Source

avcodec/h264_ps: Check delta scale for validity

Fixes: signed integer overflow: 5 + 2147483646 cannot be represented in type 'int'
Fixes: 634/clusterfuzz-testcase-5285420445204480

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.3
Michael Niedermayer 9 years ago
parent
commit
cbd622be99
1 changed files with 8 additions and 2 deletions
  1. +8
    -2
      libavcodec/h264_ps.c

+ 8
- 2
libavcodec/h264_ps.c View File

@@ -257,8 +257,14 @@ static void decode_scaling_list(GetBitContext *gb, uint8_t *factors, int size,
memcpy(factors, fallback_list, size * sizeof(uint8_t));
else
for (i = 0; i < size; i++) {
if (next)
next = (last + get_se_golomb(gb)) & 0xff;
if (next) {
int v = get_se_golomb(gb);
if (v < -128 || v > 127) {
av_log(NULL, AV_LOG_ERROR, "delta scale %d is invalid\n", v);
v = -last;
}
next = (last + v) & 0xff;
}
if (!i && !next) { /* matrix not written, we use the preset one */
memcpy(factors, jvt_list, size * sizeof(uint8_t));
break;


Loading…
Cancel
Save