diff options
| author | Michael Niedermayer <[email protected]> | 2015-05-13 13:35:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-05-21 20:43:38 +0200 |
| commit | 1ed8a10487db9e03221f69d68722e3a210bad19b (patch) | |
| tree | 47e15024980d838acbe65e11744d4f5ff8f7eb6f | |
| parent | 502684348b3479563f6ad28d9180c47c083c1514 (diff) | |
avcodec/hevc_ps: Check vps_num_hrd_parameters
Fix CID1239052 part2
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit b195aa5d529040f43ab3acf0079cecbeb111bd57)
Signed-off-by: Michael Niedermayer <[email protected]>
| -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 45b92e14fb..8fe9a0c216 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; |