[FFmpeg-devel] [PATCH] avformat/file: Fix handing of file URIs

[Nick Sarnie <Sarnex@gentoo.org>]

The current URI handling only removes the file: prefix, but we also need 
to consider the case of percent encoding.
Percent encoding can happen with non-ASCII characters in the path.

I hit this through mpv with vobsub subtitles when dragging subtitles 
onto the player using the mouse.
Vobsub uses two files: an .idx file and a .sub file. mpv decodes the 
file path for direct inputs to mpv (the .idx file here), so that's why 
mpv works for most things today.
When passed the .idx file from a mouse-drag, mpv calls the FFmpeg mpeg 
demuxer which then tries to find the corresponding .sub file in 
vobsub_read_header.
However, mpv does not decode the path for the vobsub track name, which 
FFmpeg uses to find the sub file,
so open() was receiving the path with "file:" removed but still had the 
percent encoding, so it obviously failed.

I have a similar patch for mpv to make mpv decode the vobsub sub file 
name before passing to
FFmpeg as well, but I have received feedback from multiple mpv 
developers that this is also a
FFmpeg issue, so hopefully we can fix it in both places.

Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
---
  libavformat/file.c | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/libavformat/file.c b/libavformat/file.c
index 6103c37b34..416e7a0b6b 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -21,6 +21,7 @@
   #include "config_components.h"
  +#include "libavformat/urldecode.h"
  #include "libavutil/avstring.h"
  #include "libavutil/file_open.h"
  #include "libavutil/internal.h"
@@ -142,7 +143,9 @@ static int file_check(URLContext *h, int mask)
      int ret = 0;
      const char *filename = h->filename;
      av_strstart(filename, "file:", &filename);
-
+    filename = ff_urldecode(filename, 0);
+    if(!filename)
+      return AVERROR(ENOMEM);
      {
  #if HAVE_ACCESS && defined(R_OK)
      if (access(filename, F_OK) < 0)
@@ -174,7 +177,9 @@ static int file_delete(URLContext *h)
      int ret;
      const char *filename = h->filename;
      av_strstart(filename, "file:", &filename);
-
+    filename = ff_urldecode(filename, 0);
+    if(!filename)
+      return AVERROR(ENOMEM);
      ret = rmdir(filename);
      if (ret < 0 && (errno == ENOTDIR
  #   ifdef _WIN32
@@ -196,7 +201,13 @@ static int file_move(URLContext *h_src, URLContext 
*h_dst)
      const char *filename_src = h_src->filename;
      const char *filename_dst = h_dst->filename;
      av_strstart(filename_src, "file:", &filename_src);
+    filename_src = ff_urldecode(filename_src, 0);
+    if(!filename_src)
+      return AVERROR(ENOMEM);
      av_strstart(filename_dst, "file:", &filename_dst);
+    filename_dst = ff_urldecode(filename_dst, 0);
+    if(!filename_dst)
+      return AVERROR(ENOMEM);
       if (rename(filename_src, filename_dst) < 0)
          return AVERROR(errno);
@@ -212,6 +223,9 @@ static int file_open(URLContext *h, const char 
*filename, int flags)
      struct stat st;
       av_strstart(filename, "file:", &filename);
+    filename = ff_urldecode(filename, 0);
+    if(!filename)
+      return AVERROR(ENOMEM);
       if (flags & AVIO_FLAG_WRITE && flags & AVIO_FLAG_READ) {
          access = O_CREAT | O_RDWR;
-- 
2.38.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".