summaryrefslogtreecommitdiffstats
path: root/stream/stream.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-05 18:30:48 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-05 18:30:48 +0000
commitddf1ca2f44331976617bd45ef472d78338358250 (patch)
tree91b6391e4ec555ae41776c15795557cf64a1edb1 /stream/stream.c
parent74a67a1236bff97b6e2241996e9cb6c57e54306e (diff)
downloadmpv-ddf1ca2f44331976617bd45ef472d78338358250.tar.bz2
mpv-ddf1ca2f44331976617bd45ef472d78338358250.tar.xz
Make sure invalid protocols are rejected instead of treated
just like file:// git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21509 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream.c')
-rw-r--r--stream/stream.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/stream/stream.c b/stream/stream.c
index 00282c2db8..7b4a108b89 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -213,7 +213,8 @@ stream_t* open_stream_full(char* filename,int mode, char** options, int* file_fo
for(j = 0 ; sinfo->protocols[j] ; j++) {
l = strlen(sinfo->protocols[j]);
// l == 0 => Don't do protocol matching (ie network and filenames)
- if((l == 0) || ((strncmp(sinfo->protocols[j],filename,l) == 0) &&
+ if((l == 0 && !strstr(filename, "://")) ||
+ ((strncmp(sinfo->protocols[j],filename,l) == 0) &&
(strncmp("://",filename+l,3) == 0))) {
*file_format = DEMUXER_TYPE_UNKNOWN;
s = open_stream_plugin(sinfo,filename,mode,options,file_format,&r);