mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-10-06 02:05:36 +02:00
Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'
* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
4xm: Reject not a multiple of 16 dimension
The newly added checks are redundant and thus replaced by asserts
See: db5b487551
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
82654172ce
@ -842,6 +842,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
if (buf_size < 20)
|
if (buf_size < 20)
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
|
av_assert0(avctx->width % 16 == 0 && avctx->height % 16 == 0);
|
||||||
|
|
||||||
if (buf_size < AV_RL32(buf + 4) + 8) {
|
if (buf_size < AV_RL32(buf + 4) + 8) {
|
||||||
av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d\n",
|
av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d\n",
|
||||||
buf_size, AV_RL32(buf + 4));
|
buf_size, AV_RL32(buf + 4));
|
||||||
|
Loading…
Reference in New Issue
Block a user