fixed escaping bugs in Mojo::DOM::CSS

mojolicious · Jan 4, 2014 · 010d1c7 · 010d1c7
1 parent 93266ac
commit 010d1c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@
   - Added success attribute to Test::Mojo.
   - Improved Mojo::DOM::CSS and Mojo::DOM::HTML performance.
   - Fixed XML detection bug in Mojo::DOM.
+  - Fixed escaping bugs in Mojo::DOM::CSS.
 
 4.65  2014-01-02
   - Deprecated use of hash references for optgroup generation with

diff --git a/lib/Mojo/DOM/CSS.pm b/lib/Mojo/DOM/CSS.pm
@@ -57,7 +57,7 @@ sub _attr {
   # Ignore namespace prefix
   my $attrs = $current->[2];
   for my $name (keys %$attrs) {
-    next unless $name =~ /(?:^|:)$key$/;
+    next unless $name =~ /(?:^|:)\Q$key\E$/;
     return 1 unless defined $attrs->{$name} && defined $regex;
     return 1 if $attrs->{$name} =~ $regex;
   }
@@ -317,7 +317,7 @@ sub _selector {
     # Tag (ignore namespace prefix)
     if ($type eq 'tag') {
       my $tag = $s->[1];
-      return undef unless $tag eq '*' || $current->[1] =~ /(?:^|:)$tag$/;
+      return undef unless $tag eq '*' || $current->[1] =~ /(?:^|:)\Q$tag\E$/;
     }
 
     # Attribute

diff --git a/t/mojo/dom.t b/t/mojo/dom.t
@@ -493,21 +493,23 @@ is $dom->at('number')->ancestors('meta')->first->{xmlns}, 'uri:meta-ns',
 ok !!$dom->at('nons')->match('book > nons'),           'element did match';
 ok !$dom->at('title')->match('book > nons > section'), 'element did not match';
 
-# Namespace with dot
+# Dots
 $dom = Mojo::DOM->new(<<EOF);
 <?xml version="1.0"?>
 <foo xmlns:foo.bar="uri:first">
   <bar xmlns:fooxbar="uri:second">
     <foo.bar:baz>First</fooxbar:baz>
-    <fooxbar:yada>Second</foo.bar:yada>
+    <fooxbar:ya.da>Second</foo.bar:ya.da>
   </bar>
 </foo>
 EOF
-is $dom->at('foo bar baz')->text,  'First',      'right text';
-is $dom->at('baz')->namespace,     'uri:first',  'right namespace';
-is $dom->at('foo bar yada')->text, 'Second',     'right text';
-is $dom->at('yada')->namespace,    'uri:second', 'right namespace';
-is $dom->at('foo')->namespace,     '',           'no namespace';
+is $dom->at('foo bar baz')->text,    'First',      'right text';
+is $dom->at('baz')->namespace,       'uri:first',  'right namespace';
+is $dom->at('foo bar ya\.da')->text, 'Second',     'right text';
+is $dom->at('ya\.da')->namespace,    'uri:second', 'right namespace';
+is $dom->at('foo')->namespace,       '',           'no namespace';
+is $dom->at('[xml\.s]'), undef, 'no result';
+is $dom->at('b\.z'),     undef, 'no result';
 
 # Yadis
 $dom = Mojo::DOM->new->parse(<<'EOF');