Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: compiled/filter/ActiveFilter.cpp

Issue 29600641: Issue 5175 - Reject element hiding filter with empty domain names (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Rebased Created Dec. 5, 2017, 6:06 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « compiled/filter/ActiveFilter.h ('k') | compiled/filter/ElemHideBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiled/filter/ActiveFilter.cpp
===================================================================
--- a/compiled/filter/ActiveFilter.cpp
+++ b/compiled/filter/ActiveFilter.cpp
@@ -36,64 +36,88 @@
return mDomains.get();
}
ActiveFilter::SitekeySet* ActiveFilter::GetSitekeys() const
{
return mSitekeys.get();
}
-void ActiveFilter::ParseDomains(const String& domains,
- String::value_type separator) const
+ParsedDomains ActiveFilter::ParseDomainsInternal(const String& domains,
+ String::value_type separator, bool ignoreTrailingDot)
{
DomainMap::size_type count = 2;
for (String::size_type i = 0; i < domains.length(); i++)
if (domains[i] == separator)
count++;
- mDomains.reset(new DomainMap(count));
- annotate_address(mDomains.get(), "DomainMap");
-
StringScanner scanner(domains, 0, separator);
String::size_type start = 0;
bool reverse = false;
- bool hasIncludes = false;
+ ParsedDomains parsed;
+ parsed.hasIncludes = false;
+ parsed.domains.reserve(count);
bool done = scanner.done();
while (!done)
{
done = scanner.done();
String::value_type currChar = scanner.next();
if (currChar == u'~' && scanner.position() == start)
{
start++;
reverse = true;
}
else if (currChar == separator)
{
String::size_type len = scanner.position() - start;
- if (len > 0 && mIgnoreTrailingDot && domains[start + len - 1] == '.')
+ if (len > 0 && ignoreTrailingDot && domains[start + len - 1] == '.')
len--;
if (len > 0)
{
- enter_context("Adding to ActiveFilter.mDomains");
- (*mDomains)[DependentString(domains, start, len)] = !reverse;
+ enter_context("Adding to ParsedDomains");
+ parsed.domains.push_back(
+ ParsedDomains::Domain({start, len, reverse}));
exit_context();
if (!reverse)
- hasIncludes = true;
+ parsed.hasIncludes = true;
}
+ else
+ parsed.hasEmpty = true;
start = scanner.position() + 1;
reverse = false;
}
}
- enter_context("Adding to ActiveFilter.mDomains");
- (*mDomains)[DEFAULT_DOMAIN] = !hasIncludes;
+ return parsed;
+}
+
+void ActiveFilter::FillDomains(const String& domains, const ParsedDomains& parsed) const
+{
+ mDomains.reset(new DomainMap(parsed.domains.size()));
+ annotate_address(mDomains.get(), "DomainMap");
+
+ for (auto d : parsed.domains)
+ {
+ enter_context("Adding to DomainMap");
+ (*mDomains)[DependentString(domains, d.pos, d.len)] = !d.reverse;
+ exit_context();
+ }
+ enter_context("Adding to DomainMap");
+ (*mDomains)[DEFAULT_DOMAIN] = !parsed.hasIncludes;
exit_context();
}
+void ActiveFilter::ParseDomains(const String& domains,
+ String::value_type separator, bool ignoreTrailingDot) const
+{
+ ParsedDomains parsed = ParseDomainsInternal(domains,
+ separator, ignoreTrailingDot);
+ FillDomains(domains, parsed);
+}
+
void ActiveFilter::AddSitekey(const String& sitekey) const
{
if (!mSitekeys)
{
mSitekeys.reset(new SitekeySet());
annotate_address(mSitekeys.get(), "SitekeySet");
}
« no previous file with comments | « compiled/filter/ActiveFilter.h ('k') | compiled/filter/ElemHideBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld