mapbox: URL containing query string causes infinite loop (#5554)

* correct all EXPECT_EQ(actual, expected) to EXPECT_EQ(expected, actual)

* fix getMapboxURLPathname() of URL with querystring

* add test for normalizeSourceURL of non-mapbox protocal

* Update mapbox.cpp

Cherry-picked from e82ecc60acfeb95ec4804ecb0964a2d695416ea1.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp
index 41959563f0..97c28c0aeb 100644
--- a/src/mbgl/util/mapbox.cpp
+++ b/src/mbgl/util/mapbox.cpp
@@ -20,13 +20,14 @@ bool isMapboxURL(const std::string& url) {
 std::vector<std::string> getMapboxURLPathname(const std::string& url) {
     std::vector<std::string> pathname;
     std::size_t startIndex = protocol.length();
-    while (startIndex < url.length()) {
+    std::size_t end = url.find_first_of("?#");
+    if (end == std::string::npos) {
+        end = url.length();
+    }
+    while (startIndex < end) {
         std::size_t endIndex = url.find("/", startIndex);
         if (endIndex == std::string::npos) {
-            endIndex = url.find_first_of("?#");
-        }
-        if (endIndex == std::string::npos) {
-            endIndex = url.length();
+            endIndex = end;
         }
         pathname.push_back(url.substr(startIndex, endIndex - startIndex));
         startIndex = endIndex + 1;