[FFmpeg-cvslog] ffserver: prevent nb_streams from becoming too large
Michael Niedermayer
git at videolan.org
Sat Oct 13 00:36:00 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 13 00:30:42 2012 +0200| [0f46825d9833b70cec671d825b0065850c485196] | committer: Michael Niedermayer
ffserver: prevent nb_streams from becoming too large
Fixes CID732249
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f46825d9833b70cec671d825b0065850c485196
---
ffserver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ffserver.c b/ffserver.c
index cb7e3ae..955c326 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3474,6 +3474,9 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop
{
AVStream *fst;
+ if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams))
+ return NULL;
+
fst = av_mallocz(sizeof(AVStream));
if (!fst)
return NULL;
@@ -3821,6 +3824,9 @@ static void add_codec(FFStream *stream, AVCodecContext *av)
{
AVStream *st;
+ if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams))
+ return NULL;
+
/* compute default parameters */
switch(av->codec_type) {
case AVMEDIA_TYPE_AUDIO:
More information about the ffmpeg-cvslog
mailing list