diff options
| author | Peter Ross <pross@xvid.org> | 2024-11-07 10:30:03 +1100 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2024-11-09 08:50:59 +1100 |
| commit | c8c6319ce1a4aac718757fde48414f80167e419e (patch) | |
| tree | 6d0e877cf3805500b47b0d6e36dca5a877a0e4dd | |
| parent | 4d4d171afb2a13219920cb9b30d4304bf9d0f122 (diff) | |
| download | ffmpeg-c8c6319ce1a4aac718757fde48414f80167e419e.tar.gz | |
avcodec/rv60: prevent decode_cu_r deadlock
Fixes ticket #11289 (deadlock).
| -rw-r--r-- | libavcodec/rv60dec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/rv60dec.c b/libavcodec/rv60dec.c index 8ec95e896f..0ce346fefb 100644 --- a/libavcodec/rv60dec.c +++ b/libavcodec/rv60dec.c @@ -2271,15 +2271,17 @@ static int decode_slice(AVCodecContext *avctx, void *tdata, int cu_y, int thread ff_thread_progress_await(&s->progress[cu_y - 1], cu_x + 2); qp = s->qp + read_qp_offset(&gb, s->qp_off_type); - if (qp < 0) - return AVERROR_INVALIDDATA; + if (qp < 0) { + ret = AVERROR_INVALIDDATA; + break; + } sel_qp = calc_sel_qp(s->osvquant, qp); memset(thread.coded_blk, 0, sizeof(thread.coded_blk)); thread.cu_split_pos = 0; if ((ret = decode_cu_r(s, frame, &thread, &gb, cu_x << 6, cu_y << 6, 6, qp, sel_qp)) < 0) - return ret; + break; if (s->deblock) { thread.cu_split_pos = 0; @@ -2293,7 +2295,7 @@ static int decode_slice(AVCodecContext *avctx, void *tdata, int cu_y, int thread if (s->avctx->active_thread_type & FF_THREAD_SLICE) ff_thread_progress_report(&s->progress[cu_y], INT_MAX); - return 0; + return ret; } static int rv60_decode_frame(AVCodecContext *avctx, AVFrame * frame, |