History

avcodec/hevc_ps: Check delta_pocs in ff_hevc_decode_short_term_rps()

Fixes: integer overflow Fixes: 2893/clusterfuzz-testcase-minimized-5809330567774208

Michael Niedermayer committed 9 years ago

Commit 2b44dcb1 parent 37e8edc1 file · +12 −0Browse files

Unified · Split

libavcodec/hevc_ps.c+12−0
@@ -225,6 +225,12 @@ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx, · 224 unmodified lines
225225 prev = 0;
226226 for (i = 0; i < rps->num_negative_pics; i++) {
227227 delta_poc = get_ue_golomb_long(gb) + 1;
228+ if (delta_poc < 1 || delta_poc > 32768) {
229+ av_log(avctx, AV_LOG_ERROR,
230+ "Invalid value of delta_poc: %d\n",
231+ delta_poc);
232+ return AVERROR_INVALIDDATA;
233+ }
228234 prev -= delta_poc;
229235 rps->delta_poc[i] = prev;
230236 rps->used[i] = get_bits1(gb);
@@ -232,6 +238,12 @@ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx, · 1 unmodified line
232238 prev = 0;
233239 for (i = 0; i < nb_positive_pics; i++) {
234240 delta_poc = get_ue_golomb_long(gb) + 1;
241+ if (delta_poc < 1 || delta_poc > 32768) {
242+ av_log(avctx, AV_LOG_ERROR,
243+ "Invalid value of delta_poc: %d\n",
244+ delta_poc);
245+ return AVERROR_INVALIDDATA;
246+ }
235247 prev += delta_poc;
236248 rps->delta_poc[rps->num_negative_pics + i] = prev;
237249 rps->used[rps->num_negative_pics + i] = get_bits1(gb);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t