virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Set proper error if server flags indicate that it doesn't support mmst. This

Browse Source 
prevents a read-after-close-induced segfault later. Fixes issue 2266.

Patch by qrtt1 <chingyichan dot tw gmail com>.

Originally committed as revision 25349 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
qrtt1
2010-10-05 14:04:46 +00:00
committed by Ronald S. Bultje
parent 2a26520a97
commit 42f9582d8d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mmst.c
View File

@@ -547,8 +547,12 @@ static int mms_open(URLContext *h, const char *uri, int flags)
err = mms_safe_send_recv(mmst, NULL, SC_PKT_ASF_HEADER); err = mms_safe_send_recv(mmst, NULL, SC_PKT_ASF_HEADER);
if (err) if (err)
goto fail; goto fail;
if((mmst->incoming_flags != 0X08) && (mmst->incoming_flags != 0X0C)) if((mmst->incoming_flags != 0X08) && (mmst->incoming_flags != 0X0C)) {
av_log(NULL, AV_LOG_ERROR,
"The server does not support MMST (try MMSH or RTSP)\n");
err = AVERROR_NOFMT;
goto fail; goto fail;
}
err = ff_mms_asf_header_parser(mms); err = ff_mms_asf_header_parser(mms);
if (err) { if (err) {
dprintf(NULL, "asf header parsed failed!\n"); dprintf(NULL, "asf header parsed failed!\n");