# HG changeset patch # User rbultje # Date 1245265442 0 # Node ID 573d181e477c69b0f813f3cd6cba1a92e1202054 # Parent 79169d57638b8da70f706c1ec69aa2e856d1db4c 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. diff -r 79169d57638b -r 573d181e477c mpegenc.c --- a/mpegenc.c Wed Jun 17 07:05:17 2009 +0000 +++ b/mpegenc.c Wed Jun 17 19:04:02 2009 +0000 @@ -304,9 +304,14 @@ (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;