diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 13:35:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 14:26:17 +0200 |
| commit | 16c95b107365cdbfcde1945370b59fc7e17e0309 (patch) | |
| tree | c379f22afc88a233a96a189197e1391966391ae2 | |
| parent | 6679d5f29a1719b6aa53b74649e8b199bf562f53 (diff) | |
| download | ffmpeg-16c95b107365cdbfcde1945370b59fc7e17e0309.tar.gz | |
avcodec/hevc_ps: More completely check vps_num_layer_sets
Fixes CID1239052 part1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc_ps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index de81e011f0..b684e491f5 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -462,7 +462,8 @@ int ff_hevc_decode_nal_vps(HEVCContext *s) vps->vps_max_layer_id = get_bits(gb, 6); vps->vps_num_layer_sets = get_ue_golomb_long(gb) + 1; - if ((vps->vps_num_layer_sets - 1LL) * (vps->vps_max_layer_id + 1LL) > get_bits_left(gb)) { + if (vps->vps_num_layer_sets < 1 || vps->vps_num_layer_sets > 1024 || + (vps->vps_num_layer_sets - 1LL) * (vps->vps_max_layer_id + 1LL) > get_bits_left(gb)) { av_log(s->avctx, AV_LOG_ERROR, "too many layer_id_included_flags\n"); goto err; } |