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

lavf/avio: check for : in filenames for protocols.

Browse Source 
If the first "special" character in a filename is a comma,
it can introduce protocol options, but only if there is a
colon at the end. Otherwise, it is just a filename with a
comma.

Fix trac ticket #2303.
(cherry picked from commit d9fad53f4b447db1e436dcf3fc4a57e604616e6c)
This commit is contained in:
Nicolas George 2013-02-27 19:19:15 +01:00 committed by Carl Eugen Hoyos
parent 381e3e7e44
commit a8b92c4b3c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avio.c
View File

@ -210,7 +210,9 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags,
"Missing call to av_register_all()?\n"); "Missing call to av_register_all()?\n");
} }
if (filename[proto_len] != ':' && filename[proto_len] != ',' || is_dos_path(filename)) if (filename[proto_len] != ':' &&
(filename[proto_len] != ',' || !strchr(filename + proto_len + 1, ':')) ||
is_dos_path(filename))
strcpy(proto_str, "file"); strcpy(proto_str, "file");
else else
av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str))); av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str)));