Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/swfdec.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index fa2435e0a0..2d8e3b0e3e 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -395,6 +395,11 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pos = pos;
pkt->stream_index = st->index;
+ if (linesize * height > pkt->size) {
+ res = AVERROR_INVALIDDATA;
+ goto bitmap_end;
+ }
+
switch (bmp_fmt) {
case 3:
pix_fmt = AV_PIX_FMT_PAL8;
@@ -422,10 +427,6 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
} else
st->codecpar->format = pix_fmt;
- if (linesize * height > pkt->size) {
- res = AVERROR_INVALIDDATA;
- goto bitmap_end;
- }
memcpy(pkt->data, buf + colormapsize*colormapbpp, linesize * height);
res = pkt->size;