eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-02 20:30:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/sanm: distrust dimensions for ANIM in decode_init

Browse Source 
When decode_init() is called for ANIM content, zero the dimensions
set in avctx width/height. Only SANM files have image dimensions in
their header, while ANIM do not.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
This commit is contained in:
Manuel Lauss
2025-09-22 09:40:55 +02:00
parent 0802044d81
commit 70b04717d0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/sanm.c
View File

@@ -635,6 +635,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->pix_fmt = ctx->version ? AV_PIX_FMT_RGB565 : AV_PIX_FMT_PAL8;
if (!ctx->version) {
// ANIM has no dimensions in the header, distrust the incoming data.
avctx->width = avctx->height = 0;
ctx->have_dimensions = 0;
}
init_sizes(ctx, avctx->width, avctx->height);
if (init_buffers(ctx)) {
av_log(avctx, AV_LOG_ERROR, "Error allocating buffers.\n");
@@ -1814,6 +1819,9 @@ static int process_frame_obj(SANMVideoContext *ctx, GetByteContext *gb,
yres = FFMAX(yres, ctx->height);
}
if ((xres < (fsc ? 8 : 1)) || (yres < (fsc ? 8 : 1)) || (xres > 640) || (yres > 480))
return AVERROR_INVALIDDATA;
if (ctx->width < xres || ctx->height < yres) {
int ret = ff_set_dimensions(ctx->avctx, xres, yres);
if (ret < 0)