Issue 4395 - Setting page is loaded non-populated on some systems

src/plugin/PluginTabBase.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 137 matching lines @@
   /**
    * Determine if the HTML file is one of ours.
    * The criterion is that it appear in the "html/templates" folder within our installation.
    *
    * Warning: This function may fail if the argument is not a "file://" URL.
    * This is occasionally the case in circumstances yet to be characterized.
    */
   bool IsOurHtmlFile(const std::wstring& url)
   {
     // Declared static because the value is derived from an installation directory, which won't change during run-time.
-    static auto dir = FileUrl(HtmlFolderPath());
+    static auto dir = CanonicalizeUrl(FileUrl(HtmlFolderPath()));
 
-    dir = EscapeUrl(CanonicalizeUrl(dir));
-    std::wstring urlCanonicalized = EscapeUrl(CanonicalizeUrl(url));
+    std::wstring urlCanonical = CanonicalizeUrl(url);
 
     DEBUG_GENERAL([&]() -> std::wstring {
       std::wstring log = L"InjectABP. Current URL: ";
-      log += urlCanonicalized;
+      log += urlCanonical;
       log += L", template directory URL: ";
       log += dir;
       return log;
     }());
 
     /*
      * The length check here is defensive, in case the document URL is truncated for some reason.
      */
-    if (urlCanonicalized.length() < 5)
+    if (urlCanonical.length() < 5)
     {
       // We can't match ".html" at the end of the URL if it's too short.
       return false;
     }
-    auto urlCstr = urlCanonicalized.c_str();
+    auto urlCstr = urlCanonical.c_str();
     // Check the prefix to match our directory
     // Check the suffix to be an HTML file
-    // Compare escaped version and return
     return (_wcsnicmp(urlCstr, dir.c_str(), dir.length()) == 0) &&
-      (_wcsnicmp(urlCstr + url.length() - 5, L".html", 5) == 0);
+      (_wcsnicmp(urlCstr + urlCanonical.length() - 5, L".html", 5) == 0);
   }
 }
 
 void CPluginTab::InjectABP(IWebBrowser2* browser)
 {
   CriticalSection::Lock lock(m_csInject);
   auto url = GetDocumentUrl();
   if (!IsOurHtmlFile(url))
   {
     DEBUG_GENERAL(L"InjectABP. Not injecting");
@@ skipping 424 matching lines @@
           LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginError.GetProcessId(), pluginError.GetThreadId());
         }
 
         // Non-hanging sleep
         Sleep(50);
       }
 
       tabLoopIteration++;
   }
 }