Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c30425f authored by Lajos Molnar's avatar Lajos Molnar
Browse files

Fix M3UParser relative path handling. 

Bug: 16017037
Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
parent 787bdb33

media/libstagefright/httplive/M3UParser.cpp

+3 −1
Original line number Diff line number Diff line
@@ -398,6 +398,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.
@@ -442,7 +444,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);