diff options
| author | Marton Balint <cus@passwd.hu> | 2022-06-12 00:13:27 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2022-06-20 22:56:49 +0200 |
| commit | 571683696306f22d9519f62dcffb2164d49ee3c5 (patch) | |
| tree | 9355cad97acdb738ebca47036a91ffd1e75c8a17 | |
| parent | a5c7d3173c756e9a9b33f1620e3620eb60dd52b4 (diff) | |
| download | ffmpeg-571683696306f22d9519f62dcffb2164d49ee3c5.tar.gz | |
avcodec/v210dec: disallow negative custom stride
Also make sure a big custom stride does not overflow size check.
Avoids segfaults.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavcodec/v210dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index c89440658f..e97f43a8e6 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -141,7 +141,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *pic, stride = aligned_width * 8 / 3; } - if (avpkt->size < stride * avctx->height) { + if (avpkt->size < (int64_t)stride * avctx->height) { if ((((avctx->width + 23) / 24) * 24 * 8) / 3 * avctx->height == avpkt->size) { stride = avpkt->size / avctx->height; if (!s->stride_warning_shown) @@ -190,7 +190,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *pic, #define V210DEC_FLAGS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM static const AVOption v210dec_options[] = { {"custom_stride", "Custom V210 stride", offsetof(V210DecContext, custom_stride), AV_OPT_TYPE_INT, - {.i64 = 0}, INT_MIN, INT_MAX, V210DEC_FLAGS}, + {.i64 = 0}, 0, INT_MAX, V210DEC_FLAGS}, {NULL} }; |