From 6b9217cc7eeb72363f33a0b1330dcdca52d25f8e Mon Sep 17 00:00:00 2001
From: Richard Walters <rwalters@digitalstirling.com>
Date: Sun, 1 Jul 2018 14:45:45 -0700
Subject: Fix bug in parsing scheme

A colon may be in the authority, if present, so limit
the search for scheme delimiter so we aren't scanning
the authority part, when parsing the scheme.
---
 src/Uri.cpp           |  6 +++++-
 test/src/UriTests.cpp | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/Uri.cpp b/src/Uri.cpp
index 1a82ee8..e218ecd 100644
--- a/src/Uri.cpp
+++ b/src/Uri.cpp
@@ -330,7 +330,11 @@ namespace Uri {
 
     bool Uri::ParseFromString(const std::string& uriString) {
         // First parse the scheme.
-        const auto schemeEnd = uriString.find(':');
+        auto authorityDelimiter = uriString.find("//");
+        if (authorityDelimiter == std::string::npos) {
+            authorityDelimiter = uriString.length();
+        }
+        const auto schemeEnd = uriString.substr(0, authorityDelimiter).find(':');
         std::string rest;
         if (schemeEnd == std::string::npos) {
             impl_->scheme.clear();
diff --git a/test/src/UriTests.cpp b/test/src/UriTests.cpp
index d246a4d..1724b89 100644
--- a/test/src/UriTests.cpp
+++ b/test/src/UriTests.cpp
@@ -310,3 +310,20 @@ TEST(UriTests, ParseFromStringUserInfoBarelyLegal) {
         ++index;
     }
 }
+
+TEST(UriTests, ParseFromStringDontMisinterpretColonInAuthorityAsSchemeDelimiter) {
+    const std::vector< std::string > testVectors{
+        {"//foo:bar@www.example.com/"},
+        {"//www.example.com/a:b"},
+        {"//www.example.com/foo?a:b"},
+        {"//www.example.com/foo#a:b"},
+        {"//[v7.:]/"},
+    };
+    size_t index = 0;
+    for (const auto& testVector : testVectors) {
+        Uri::Uri uri;
+        ASSERT_TRUE(uri.ParseFromString(testVector)) << index;
+        ASSERT_TRUE(uri.GetScheme().empty());
+        ++index;
+    }
+}
-- 
cgit v1.2.3