diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-02-27 19:19:15 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-01 08:57:53 +0100 |
| commit | a8b92c4b3ccb04a546eb93cc656b091d58414686 (patch) | |
| tree | 263156acb2102dfd6402232901a03b0b381c1253 | |
| parent | 381e3e7e44f9ca9726b5c8ae8ab731daec67e6fd (diff) | |
| download | ffmpeg-a8b92c4b3ccb04a546eb93cc656b091d58414686.tar.gz | |
lavf/avio: check for : in filenames for protocols.
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)
| -rw-r--r-- | libavformat/avio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index c7b7bc67d5..2e652f3208 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -210,7 +210,9 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags, "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"); else av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str))); |