diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 13:35:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 10:04:51 +0200 |
| commit | e8784ec5f5e829892f185e80c177bc8a9e93e344 (patch) | |
| tree | 07b7c421a71682da89f20a28ccd6d7de89e90ede | |
| parent | 0a93dc83d26a3e49040e6005519ac9c415d97154 (diff) | |
| download | ffmpeg-e8784ec5f5e829892f185e80c177bc8a9e93e344.tar.gz | |
avcodec/hevc_ps: Check vps_num_hrd_parameters
Fix CID1239052 part2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b195aa5d529040f43ab3acf0079cecbeb111bd57)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc_ps.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index ffd65c47f6..38d99cf1bf 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -442,6 +442,11 @@ int ff_hevc_decode_nal_vps(HEVCContext *s) if (vps->vps_poc_proportional_to_timing_flag) vps->vps_num_ticks_poc_diff_one = get_ue_golomb_long(gb) + 1; vps->vps_num_hrd_parameters = get_ue_golomb_long(gb); + if (vps->vps_num_hrd_parameters > (unsigned)vps->vps_num_layer_sets) { + av_log(s->avctx, AV_LOG_ERROR, + "vps_num_hrd_parameters %d is invalid\n", vps->vps_num_hrd_parameters); + goto err; + } for (i = 0; i < vps->vps_num_hrd_parameters; i++) { int common_inf_present = 1; |