Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 11 insertions, 6 deletions

diff --git a/servo/components/selectors/attr.rs b/servo/components/selectors/attr.rs
index fee2962237..70a0c5ea95 100644
--- a/servo/components/selectors/attr.rs
+++ b/servo/components/selectors/attr.rs
@@ -111,16 +111,21 @@ impl AttrSelectorOperator {
         let case = case_sensitivity;
         match self {
             AttrSelectorOperator::Equal => case.eq(e, s),
-            AttrSelectorOperator::Prefix => e.len() >= s.len() && case.eq(&e[..s.len()], s),
+            AttrSelectorOperator::Prefix => {
+                !s.is_empty() && e.len() >= s.len() && case.eq(&e[..s.len()], s)
+            },
             AttrSelectorOperator::Suffix => {
-                e.len() >= s.len() && case.eq(&e[(e.len() - s.len())..], s)
+                !s.is_empty() && e.len() >= s.len() && case.eq(&e[(e.len() - s.len())..], s)
             },
             AttrSelectorOperator::Substring => {
-                case.contains(element_attr_value, attr_selector_value)
+                !s.is_empty() && case.contains(element_attr_value, attr_selector_value)
+            },
+            AttrSelectorOperator::Includes => {
+                !s.is_empty() &&
+                    element_attr_value
+                        .split(SELECTOR_WHITESPACE)
+                        .any(|part| case.eq(part.as_bytes(), s))
             },
-            AttrSelectorOperator::Includes => element_attr_value
-                .split(SELECTOR_WHITESPACE)
-                .any(|part| case.eq(part.as_bytes(), s)),
             AttrSelectorOperator::DashMatch => {
                 case.eq(e, s) || (e.get(s.len()) == Some(&b'-') && case.eq(&e[..s.len()], s))
             },