applehttp: Handle a .. path segment in the base url

Originally committed as revision 25318 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index f8f1f39..f2f5838 100644 (file)
--- a/libavformat/applehttp.c
+++ b/libavformat/applehttp.c
@@ -104,6 +104,12 @@ static void make_absolute_url(char *buf, int size, const char *base,
     while (av_strstart(rel, "../", NULL) && sep) {
         sep[0] = '\0';
         sep = strrchr(buf, '/');
+        /* If the next directory name to pop off is "..", break here */
+        if (!strcmp(sep ? &sep[1] : buf, "..")) {
+            /* Readd the slash we just removed */
+            av_strlcat(buf, "/", size);
+            break;
+        }
         if (sep)
             sep[1] = '\0';
         else