generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check if stream is set, fix potential segv

Browse Source 
Originally committed as revision 15693 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-10-25 00:49:56 +00:00
parent b6bb00b07d
commit a69b06be93
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffserver.c
View File

@ -4018,11 +4018,13 @@ static int parse_ffconfig(const char *filename)
} }
} else if (!strcasecmp(cmd, "InputFormat")) { } else if (!strcasecmp(cmd, "InputFormat")) {
get_arg(arg, sizeof(arg), &p); get_arg(arg, sizeof(arg), &p);
if (stream) {
stream->ifmt = av_find_input_format(arg); stream->ifmt = av_find_input_format(arg);
if (!stream->ifmt) { if (!stream->ifmt) {
fprintf(stderr, "%s:%d: Unknown input format: %s\n", fprintf(stderr, "%s:%d: Unknown input format: %s\n",
filename, line_num, arg); filename, line_num, arg);
} }
}
} else if (!strcasecmp(cmd, "FaviconURL")) { } else if (!strcasecmp(cmd, "FaviconURL")) {
if (stream && stream->stream_type == STREAM_TYPE_STATUS) { if (stream && stream->stream_type == STREAM_TYPE_STATUS) {
get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p); get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);