Merge pull request #257 from Randalphwa/first-of-type_bug

sammycage · web-flow · commit 2cdbfabbdbe0 · 2026-01-08T17:37:12.000+01:00
Fix infinite loop, specificity bug
diff --git a/source/svgparser.cpp b/source/svgparser.cpp
@@ -214,7 +214,7 @@ static bool matchPseudoClassSelector(const PseudoClassSelector& selector, const
         while(sibling) {
             if(sibling->id() == element->id())
                 return false;
-            sibling = element->previousElement();
+            sibling = sibling->previousElement();
         }
 
         return true;
@@ -225,7 +225,7 @@ static bool matchPseudoClassSelector(const PseudoClassSelector& selector, const
         while(sibling) {
             if(sibling->id() == element->id())
                 return false;
-            sibling = element->nextElement();
+            sibling = sibling->nextElement();
         }
 
         return true;
@@ -571,6 +571,9 @@ static RuleDataList parseStyleSheet(std::string_view input)
                 for(const auto& attributeSelector : simpleSelector.attributeSelectors) {
                     specificity += (attributeSelector.id == PropertyID::Id) ? 0x10000 : 0x100;
                 }
+                for(const auto& pseudoClassSelector : simpleSelector.pseudoClassSelectors) {
+                    specificity += 0x100;
+                }
             }
 
             rules.emplace_back(selector, rule.declarations, specificity, rules.size());

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ static bool matchPseudoClassSelector(const PseudoClassSelector& selector, const`
`214`	`214`	`while(sibling) {`
`215`	`215`	`if(sibling->id() == element->id())`
`216`	`216`	`return false;`
`217`		`- sibling = element->previousElement();`
	`217`	`+ sibling = sibling->previousElement();`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`return true;`
`@@ -225,7 +225,7 @@ static bool matchPseudoClassSelector(const PseudoClassSelector& selector, const`
`225`	`225`	`while(sibling) {`
`226`	`226`	`if(sibling->id() == element->id())`
`227`	`227`	`return false;`
`228`		`- sibling = element->nextElement();`
	`228`	`+ sibling = sibling->nextElement();`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`return true;`
`@@ -571,6 +571,9 @@ static RuleDataList parseStyleSheet(std::string_view input)`
`571`	`571`	`for(const auto& attributeSelector : simpleSelector.attributeSelectors) {`
`572`	`572`	`specificity += (attributeSelector.id == PropertyID::Id) ? 0x10000 : 0x100;`
`573`	`573`	`}`
	`574`	`+ for(const auto& pseudoClassSelector : simpleSelector.pseudoClassSelectors) {`
	`575`	`+ specificity += 0x100;`
	`576`	`+ }`
`574`	`577`	`}`
`575`	`578`
`576`	`579`	`rules.emplace_back(selector, rule.declarations, specificity, rules.size());`