From 86f3a9dbbdc360db3716b878dd37f2dbec8e983c Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Oct 2017 18:12:17 -0700
Subject: [PATCH] Fix Strings::split() to handle delimiters of arbitrary size

---
 toolsrc/src/vcpkg_Strings.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp
index 21df2c3094..bbe6b29cd8 100644
--- a/toolsrc/src/vcpkg_Strings.cpp
+++ b/toolsrc/src/vcpkg_Strings.cpp
@@ -154,11 +154,13 @@ namespace vcpkg::Strings
             return output;
         }
 
+        const size_t delimiter_length = delimiter.length();
         size_t i = 0;
         for (size_t pos = s.find(delimiter); pos != std::string::npos; pos = s.find(delimiter, pos))
         {
             output.push_back(s.substr(i, pos - i));
-            i = ++pos;
+            pos += delimiter_length;
+            i = pos;
         }
 
         // Add the rest of the string after the last delimiter, unless there is nothing after it