aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ylc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-28 17:20:42 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-28 17:21:41 +0200
commit67b30decf7793523f7fdaef6fdf7f1179ef42b18 (patch)
treeba95995138cbadb337598d4d657861a71f5f926a /libavcodec/ylc.c
parentb9c032ebc0ad17ac0ffefb915ff96baf9d79cab1 (diff)
downloadffmpeg-67b30decf7793523f7fdaef6fdf7f1179ef42b18.tar.gz
avcodec/ylc: Check count in build_vlc()
Fixes: runtime error: signed integer overflow: 211633430 + 2147483647 cannot be represented in type 'int' Fixes: 1874/clusterfuzz-testcase-minimized-5037763613163520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ylc.c')
-rw-r--r--libavcodec/ylc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c
index 02162a37e7..bf55e37be1 100644
--- a/libavcodec/ylc.c
+++ b/libavcodec/ylc.c
@@ -109,7 +109,7 @@ static int build_vlc(AVCodecContext *avctx, VLC *vlc, const uint32_t *table)
int new_node = j;
int first_node = cur_node;
int second_node = cur_node;
- int nd, st;
+ unsigned nd, st;
nodes[cur_node].count = -1;
@@ -133,6 +133,10 @@ static int build_vlc(AVCodecContext *avctx, VLC *vlc, const uint32_t *table)
st = nodes[first_node].count;
nodes[second_node].count = 0;
nodes[first_node].count = 0;
+ if (nd >= UINT32_MAX - st) {
+ av_log(avctx, AV_LOG_ERROR, "count overflow\n");
+ return AVERROR_INVALIDDATA;
+ }
nodes[cur_node].count = nd + st;
nodes[cur_node].sym = -1;
nodes[cur_node].n0 = cur_node;