Issue 5175 - Reject element hiding filter with empty domain names

compiled/filter/RegExpFilter.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cctype>
 #include <climits>
 #include <cstdio>
 #include <string>
 
 #include "RegExpFilter.h"
 #include "../library.h"
 #include "../StringScanner.h"
 #include "../StringMap.h"
+
+ABP_NS_USING
 
 namespace
 {
   enum
   {
     TYPE_OTHER = 0x1,
     TYPE_SCRIPT = 0x2,
     TYPE_IMAGE = 0x4,
     TYPE_STYLESHEET = 0x8,
     TYPE_OBJECT = 0x10,
@@ skipping 174 matching lines @@
       {
         data.mSitekeysStart = valueStart;
         data.mSitekeysEnd = valueEnd;
       }
     }
     else if (name.equals(u"match-case"_str))
       data.mMatchCase = !reverse;
     else if (name.equals(u"third-party"_str))
       data.mThirdParty = reverse ? TrippleState::NO : TrippleState::YES;
     else if (name.equals(u"collapse"_str))
-      data.mCollapse = reverse ? TrippleState::NO : TrippleState::YES;
+      data.mCollapse = !reverse;
     else
       error.reset(u"filter_unknown_option"_str);
   }
 
   void ParseOptions(String& text, DependentString& error, RegExpFilterData& data,
       String::size_type optionsStart)
   {
     data.mMatchCase = false;
     data.mThirdParty = TrippleState::ANY;
-    data.mCollapse = TrippleState::ANY;
+    data.mCollapse = true;
     data.mDomainsStart = String::npos;
     data.mSitekeysStart = String::npos;
     if (optionsStart >= text.length())
     {
       data.mContentType = defaultTypeMask;
       return;
     }
 
     data.mContentType = -1;
 
@@ skipping 101 matching lines @@
   }
 }
 
 void RegExpFilter::GenerateCustomBindings()
 {
   printf("exports.RegExpFilter.typeMap = {\n");
 
   for (const auto& item : typeMap)
   {
     std::string type(item.first.length(), '\0');
-    for (int i = 0; i < item.first.length(); i++)
+    for (String::size_type i = 0; i < item.first.length(); i++)
       type[i] = (item.first[i] == '-' ? '_' : toupper(item.first[i]));
     printf("  %s: %i,\n", type.c_str(), item.second);
   }
   printf("};\n");
 }
 
 RegExpFilter::DomainMap* RegExpFilter::GetDomains() const
 {
   if (!mData.DomainsParsingDone())
   {
@@ skipping 24 matching lines @@
     return false;
   }
 
   if (!mData.RegExpParsingDone())
   {
     const OwnedString pattern(mData.GetRegExpSource(mText));
     mData.SetRegExp(GenerateRegExp(RegExpFromSource(pattern), mData.mMatchCase));
   }
   return TestRegExp(mData.mRegexpId, location);
 }