From 77015443a84bb5dbed38eafc2ea26a2bf2641ed6 Mon Sep 17 00:00:00 2001 From: Alexander Strasser Date: Thu, 2 Jan 2014 19:00:15 +0100 Subject: [PATCH] lavf/file: file_check: Handle file URLs that start with "file:" Handle the URL analog to file_open, it may contain a "file:" prefix. Skip it. Make access checks to file URLs starting with "file:" work. Fix part of ticket #3249. Signed-off-by: Alexander Strasser --- libavformat/file.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index 2defc75e5f..1d323e2137 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -104,25 +104,30 @@ static int file_get_handle(URLContext *h) static int file_check(URLContext *h, int mask) { -#if HAVE_ACCESS && defined(R_OK) int ret = 0; - if (access(h->filename, F_OK) < 0) + const char *filename = h->filename; + av_strstart(filename, "file:", &filename); + + { +#if HAVE_ACCESS && defined(R_OK) + if (access(filename, F_OK) < 0) return AVERROR(errno); if (mask&AVIO_FLAG_READ) - if (access(h->filename, R_OK) >= 0) + if (access(filename, R_OK) >= 0) ret |= AVIO_FLAG_READ; if (mask&AVIO_FLAG_WRITE) - if (access(h->filename, W_OK) >= 0) + if (access(filename, W_OK) >= 0) ret |= AVIO_FLAG_WRITE; #else struct stat st; - int ret = stat(h->filename, &st); + ret = stat(filename, &st); if (ret < 0) return AVERROR(errno); ret |= st.st_mode&S_IRUSR ? mask&AVIO_FLAG_READ : 0; ret |= st.st_mode&S_IWUSR ? mask&AVIO_FLAG_WRITE : 0; #endif + } return ret; }