Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 391e0fc6c90ced6656b74f50f3a487b6dc76ea63 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Niedermayer <michaelni@gmx.at> |
| 3 | Date: Thu, 29 Nov 2012 15:18:17 +0100 |
| 4 | Subject: [PATCH] roqvideodec: check dimensions validity |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | |
| 8 | Commit 391e0fc6c90ced6656b74f50f3a487b6dc76ea63 release/0.7 |
| 9 | |
| 10 | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind |
| 11 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |
| 12 | (cherry picked from commit 3ae610451170cd5a28b33950006ff0bd23036845) |
| 13 | |
| 14 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |
| 15 | --- |
| 16 | libavcodec/roqvideodec.c | 6 ++++++ |
| 17 | 1 file changed, 6 insertions(+) |
| 18 | |
| 19 | diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c |
| 20 | index f0977f6..4e34231 100644 |
| 21 | --- a/gst-libs/ext/libav/libavcodec/roqvideodec.c |
| 22 | +++ b/gst-libs/ext/libav/libavcodec/roqvideodec.c |
| 23 | @@ -157,6 +157,12 @@ static av_cold int roq_decode_init(AVCodecContext *avctx) |
| 24 | RoqContext *s = avctx->priv_data; |
| 25 | |
| 26 | s->avctx = avctx; |
| 27 | + |
| 28 | + if (avctx->width%16 || avctx->height%16) { |
| 29 | + av_log_ask_for_sample(avctx, "dimensions not being a multiple of 16 are unsupported\n"); |
| 30 | + return AVERROR_PATCHWELCOME; |
| 31 | + } |
| 32 | + |
| 33 | s->width = avctx->width; |
| 34 | s->height = avctx->height; |
| 35 | avcodec_get_frame_defaults(&s->frames[0]); |
| 36 | -- |