Issue 1793 - check whether the frame is whitelisted before injecting CSS

src/engine/Main.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 94 matching lines @@
   };
 
   std::string GetWhitelistingFilter(const std::string& urlArg,
     const std::vector<std::string>& frameHierarchy, AdblockPlus::FilterEngine::ContentType type)
   {
     if (frameHierarchy.empty())
     {
       return GetWhitelistingFilter(urlArg, "", type);
     }
     auto frameIterator = frameHierarchy.begin();
-    std::string parentUrl;

[Eric, 2015/11/14 20:28:13]

This declaration can go inside the loop.

[sergei, 2015/11/17 20:15:59]

Done.

     std::string url = urlArg;
-    while (frameIterator != frameHierarchy.end())

[Eric, 2015/11/14 20:28:13]

Since you've already taken care of the empty case first, it would be clearer
here to use a do-while loop.

Alternately, use a for loop and declare-and-initialize 'url' as its first
clause.

[sergei, 2015/11/17 20:15:59]

Done.

-    {
-      parentUrl = *frameIterator;

[Eric, 2015/11/14 20:28:13]

The rvalue expression could be "*frameIterator++". There's no need for a
separate increment statement at the end of the loop.

[sergei, 2015/11/17 20:15:59]

Done.

+    do
+    {
+      std::string parentUrl = *frameIterator++;
       auto filterText = GetWhitelistingFilter(url, parentUrl, type);
       if (!filterText.empty())
       {
         return filterText;
       }
       url = parentUrl;
-      ++frameIterator;
-    }
+    }
+    while (frameIterator != frameHierarchy.end());
     return "";
   }
 
   void WriteSubscriptions(Communication::OutputBuffer& response,
       const std::vector<AdblockPlus::SubscriptionPtr>& subscriptions)
   {
     int32_t count = static_cast<int32_t>(subscriptions.size());
     response << count;
     for (int32_t i = 0; i < count; i++)
     {
@@ skipping 619 matching lines @@
   });
 
   int retValue = _AtlModule.WinMain(cmdShow);
   if (communicationThread.joinable())
   {
     communicationThread.join();
   }
 
   return retValue;
 }