Fix M3UParser relative path handling.

Bug: 16017037
Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137

1 files changed, 3 insertions, 1 deletions

diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 281e0da..4f7668c 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -413,6 +413,8 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) {
         // Base URL must be absolute
         return false;
     }
+    const size_t schemeEnd = (strstr(baseURL, "//") - baseURL) + 2;
+    CHECK(schemeEnd == 7 || schemeEnd == 8);
 
     if (!strncasecmp("http://", url, 7) || !strncasecmp("https://", url, 8)) {
         // "url" is already an absolute URL, ignore base URL.
@@ -457,7 +459,7 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) {
 
         // Check whether the found slash actually is part of the path
         // and not part of the "http://".
-        if (end > 6) {
+        if (end >= schemeEnd) {
             out->setTo(baseURL, end);
         } else {
             out->setTo(baseURL);