[FFmpeg-cvslog] ffserver: prevent nb_streams from becoming too large

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 13 00:30:42 2012 +0200| [3038e2041e87ffd3d249ce0c8109f19207ca0017] | committer: Michael Niedermayer

ffserver: prevent nb_streams from becoming too large

Fixes CID732249

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0f46825d9833b70cec671d825b0065850c485196)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3038e2041e87ffd3d249ce0c8109f19207ca0017
---

 ffserver.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ffserver.c b/ffserver.c
index 79463c0..aebe651 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3457,6 +3457,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;
@@ -3802,6 +3805,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: