Issue 1115 - Some yahoo page not correctly shown on IE8 when ABP enabled

src/shared/Utils.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 129 matching lines @@
 }
 
 void ReplaceString(std::wstring& input, const std::wstring placeholder, const std::wstring replacement)
 {
   size_t replaceStart = input.find(placeholder);
   if (replaceStart != std::string::npos)
   {
     input.replace(replaceStart, placeholder.length(), replacement);
   }
 }
+
+std::wstring GetSchemeAndHierarchicalPart(const std::wstring& url)
+{
+  auto schemeAndHierarchicalPartEndsAt = url.find(L'?');
+  if (schemeAndHierarchicalPartEndsAt == std::wstring::npos)
+  {
+    schemeAndHierarchicalPartEndsAt = url.find(L'#');
+  }
+  return url.substr(0, schemeAndHierarchicalPartEndsAt);
+}
+
+std::wstring GetQueryString(const std::wstring& url)
+{
+  auto questionSignPos = url.find(L'?');
+  if (questionSignPos == std::wstring::npos)
+  {
+    return L"";
+  }
+  auto queryStringBeginsAt = questionSignPos + 1;
+  auto endQueryStringPos = url.find(L'#', queryStringBeginsAt);
+  if (endQueryStringPos == std::wstring::npos)
+  {
+    endQueryStringPos = url.length();
+  }
+  return url.substr(queryStringBeginsAt, endQueryStringPos - queryStringBeginsAt);
+}
+
+void ForEachToken(const std::wstring& value, wchar_t delimiter,
+                 const std::function<bool(std::wstring::const_iterator begin, std::wstring::const_iterator end)>& tokenHandler)

[Eric, 2015/02/13 16:33:43]

You might change "tokenHandler" to "fn" here. Or at least "tokenFn".

This is not a strong opinion.

+{
+  if (value.empty())
+  {
+    return;
+  }
+  std::wstring::size_type delimiterPos = value.find(delimiter);
+  std::wstring::size_type prevDelimiterPos = 0;
+  while(delimiterPos != std::wstring::npos)
+  {
+    if (!tokenHandler(value.begin() + prevDelimiterPos, value.begin() + delimiterPos))
+    {
+      return;
+    }
+    prevDelimiterPos = delimiterPos;
+    ++prevDelimiterPos; // skip the delimiter
+    delimiterPos = value.find(delimiter, prevDelimiterPos);
+  }
+  tokenHandler(value.begin() + prevDelimiterPos, value.end());
+}
+
+void ForEachQueryStringParameter(const std::wstring& queryString,
+                                 const std::function<bool(const std::wstring& name, const std::wstring& value)>& parameterHandler)

[Eric, 2015/02/13 16:33:43]

See comment above.

+{
+  if (queryString.empty())
+  {
+    return;
+  }
+  ForEachToken(queryString, L'&',
+    [&parameterHandler](std::wstring::const_iterator begin,
+                        std::wstring::const_iterator end)->bool
+    {
+      auto assignSignIt = std::find(begin, end, L'=');
+      auto valueBeginsAt = assignSignIt != end ? assignSignIt + 1 : assignSignIt;
+      return parameterHandler(std::wstring(begin, assignSignIt), std::wstring(valueBeginsAt, end));
+    });
+}