From f4ca612fbd9549e74dafa1c5bfb3e7b33e4b38e2 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Wed, 17 Jun 2009 19:04:02 +0000
Subject: [PATCH] Set restrictions on packet_size, as per ISO-11172 / H-222
specifications (max packet size should fit in 13 bits as a kB value, so
1<<23, plus the header which is 10 bytes), and as per mpegenc.c internal
assumptions (min packet size is 20 bytes). See "[PATCH] make packet_size in
AVFormatContext unsigned" thread.
Originally committed as revision 19215 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/mpegenc.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index b7bb69b91df..df4c9919a46 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -304,9 +304,14 @@ static int mpeg_mux_init(AVFormatContext *ctx)
(CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer));
s->is_dvd = (CONFIG_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer);
- if(ctx->packet_size)
+ if(ctx->packet_size) {
+ if (ctx->packet_size < 20 || ctx->packet_size > (1 << 23) + 10) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid packet size %d\n",
+ ctx->packet_size);
+ goto fail;
+ }
s->packet_size = ctx->packet_size;
- else
+ } else
s->packet_size = 2048;
s->vcd_padding_bytes_written = 0;
--
GitLab