OSDN Git Service

check that redirect is set, fixes CID13 RUN2
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Thu, 29 May 2008 02:31:35 +0000 (02:31 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Thu, 29 May 2008 02:31:35 +0000 (02:31 +0000)
Originally committed as revision 13524 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffserver.c

index 4952075..6bc447c 100644 (file)
@@ -4274,13 +4274,14 @@ static int parse_ffconfig(const char *filename)
                 fprintf(stderr, "%s:%d: No corresponding <Redirect> for </Redirect>\n",
                         filename, line_num);
                 errors++;
-            }
+            } else {
             if (!redirect->feed_filename[0]) {
                 fprintf(stderr, "%s:%d: No URL found for <Redirect>\n",
                         filename, line_num);
                 errors++;
             }
             redirect = NULL;
+            }
         } else if (!strcasecmp(cmd, "LoadModule")) {
             get_arg(arg, sizeof(arg), &p);
 #ifdef HAVE_DLOPEN