virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/mlvdec: fix size checks

Browse Source 
Fixes: heap-buffer-overflow
Fixes: 391962476/clusterfuzz-testcase-minimized-ffmpeg_dem_MLV_fuzzer-5746746587676672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-02-07 02:33:21 +01:00
parent 1afbc40875
commit 251d43aef0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mlvdec.c
View File

@@ -471,6 +471,9 @@ static int get_packet_lj92(AVFormatContext *avctx, AVStream *st, AVIOContext *pb
uint8_t *stripofs, *matrixofs; uint8_t *stripofs, *matrixofs;
#define MAX_HEADER_SIZE 2048 #define MAX_HEADER_SIZE 2048
if ((uint64_t)size > INT32_MAX - MAX_HEADER_SIZE)
return AVERROR_PATCHWELCOME;
if ((ret = av_new_packet(pkt, size + MAX_HEADER_SIZE)) < 0) if ((ret = av_new_packet(pkt, size + MAX_HEADER_SIZE)) < 0)
return ret; return ret;
@@ -562,10 +565,14 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
avio_skip(pb, 12); //timestamp, frameNumber avio_skip(pb, 12); //timestamp, frameNumber
size -= 12; size -= 12;
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
if (size < 8)
return AVERROR_INVALIDDATA;
avio_skip(pb, 8); // cropPosX, cropPosY, panPosX, panPosY avio_skip(pb, 8); // cropPosX, cropPosY, panPosX, panPosY
size -= 8; size -= 8;
} }
space = avio_rl32(pb); space = avio_rl32(pb);
if (size < space + 4LL)
return AVERROR_INVALIDDATA;
avio_skip(pb, space); avio_skip(pb, space);
size -= space; size -= space;
@@ -577,9 +584,7 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
else else
ret = av_get_packet(pb, pkt, (st->codecpar->width * st->codecpar->height * st->codecpar->bits_per_coded_sample + 7) >> 3); ret = av_get_packet(pb, pkt, (st->codecpar->width * st->codecpar->height * st->codecpar->bits_per_coded_sample + 7) >> 3);
} else { // AVMEDIA_TYPE_AUDIO } else { // AVMEDIA_TYPE_AUDIO
if (space > UINT_MAX - 24 || size < (24 + space)) ret = av_get_packet(pb, pkt, size - 4);
return AVERROR_INVALIDDATA;
ret = av_get_packet(pb, pkt, size - (24 + space));
} }
if (ret < 0) if (ret < 0)