[FFmpeg-cvslog] r15693 - trunk/ffserver.c

bcoudurier subversion
Sat Oct 25 02:49:56 CEST 2008


Author: bcoudurier
Date: Sat Oct 25 02:49:56 2008
New Revision: 15693

Log:
check if stream is set, fix potential segv

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Sat Oct 25 02:49:56 2008
@@ -4018,11 +4018,13 @@ static int parse_ffconfig(const char *fi
             }
         } else if (!strcasecmp(cmd, "InputFormat")) {
             get_arg(arg, sizeof(arg), &p);
+            if (stream) {
             stream->ifmt = av_find_input_format(arg);
             if (!stream->ifmt) {
                 fprintf(stderr, "%s:%d: Unknown input format: %s\n",
                         filename, line_num, arg);
             }
+            }
         } else if (!strcasecmp(cmd, "FaviconURL")) {
             if (stream && stream->stream_type == STREAM_TYPE_STATUS) {
                 get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);




More information about the ffmpeg-cvslog mailing list