virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

Fix an ffserver crash when a non-existing rtsp: url is requested

Browse Source 
Originally committed as revision 10519 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2007-09-17 12:47:44 +00:00
parent 7f559eb1cd
commit 25e3e53d40
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffserver.c
View File

@ -1627,7 +1627,7 @@ static void compute_stats(HTTPContext *c)
strcpy(eosf - 4, ".asx"); strcpy(eosf - 4, ".asx");
else if (strcmp(eosf - 3, ".rm") == 0) else if (strcmp(eosf - 3, ".rm") == 0)
strcpy(eosf - 3, ".ram"); strcpy(eosf - 3, ".ram");
else if (!strcmp(stream->fmt->name, "rtp")) { else if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
/* generate a sample RTSP director if /* generate a sample RTSP director if
unicast. Generate an SDP redirector if unicast. Generate an SDP redirector if
multicast */ multicast */
@ -2684,7 +2684,8 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url)
path++; path++;
for(stream = first_stream; stream != NULL; stream = stream->next) { for(stream = first_stream; stream != NULL; stream = stream->next) {
if (!stream->is_feed && !strcmp(stream->fmt->name, "rtp") && if (!stream->is_feed &&
stream->fmt && !strcmp(stream->fmt->name, "rtp") &&
!strcmp(path, stream->filename)) { !strcmp(path, stream->filename)) {
goto found; goto found;
} }
@ -2759,7 +2760,8 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
/* now check each stream */ /* now check each stream */
for(stream = first_stream; stream != NULL; stream = stream->next) { for(stream = first_stream; stream != NULL; stream = stream->next) {
if (!stream->is_feed && !strcmp(stream->fmt->name, "rtp")) { if (!stream->is_feed &&
stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
/* accept aggregate filenames only if single stream */ /* accept aggregate filenames only if single stream */
if (!strcmp(path, stream->filename)) { if (!strcmp(path, stream->filename)) {
if (stream->nb_streams != 1) { if (stream->nb_streams != 1) {
@ -3296,7 +3298,7 @@ static void build_file_streams(void)
/* try to open the file */ /* try to open the file */
/* open stream */ /* open stream */
stream->ap_in = av_mallocz(sizeof(AVFormatParameters)); stream->ap_in = av_mallocz(sizeof(AVFormatParameters));
if (!strcmp(stream->fmt->name, "rtp")) { if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
/* specific case : if transport stream output to RTP, /* specific case : if transport stream output to RTP,
we use a raw transport stream reader */ we use a raw transport stream reader */
stream->ap_in->mpeg2ts_raw = 1; stream->ap_in->mpeg2ts_raw = 1;