Fix RT 77323: escape all characters outside the normal ASCII range

Author: timlegge

Generator.pm

@@ -1399,7 +1399,7 @@ sub escape {
     }
   } 
   if ($f & ESCAPE_HIGH_BIT) {
-    $_[0] =~ s/([\200-\377])/'&#'.ord($1).';'/ge;
+    $_[0] =~ s/([^\x00-\x7f])/'&#'.ord($1).';'/ge;
   }
 }
 

t/DOM.t

@@ -7,7 +7,7 @@ unless (eval "use XML::DOM; 1;") {
   exit;
 }
 
-plan tests => 35;
+plan tests => 36;
 
 require XML::Generator::DOM;
 
@@ -23,6 +23,9 @@ ok($xml->toString, '<bar>42</bar>');
 $xml = $x->baz({'foo'=>3});
 ok($xml->toString, '<baz foo="3"/>');
 
+$xml = $x->password('パスワードをお忘れの方');
+ok($xml->toString, '<password>パスワードをお忘れの方</password>');
+
 $xml = $x->bam({'bar'=>42},$x->foo(),"qux");
 ok($xml->toString, '<bam bar="42"><foo/>qux</bam>');
 

t/Generator.t

@@ -1,8 +1,9 @@
 #!/usr/bin/perl -w
 
 use Test;
+use utf8;
 
-BEGIN { $| = 1; plan tests => 100; }
+BEGIN { $| = 1; plan tests => 105; }
 
 use XML::Generator ();
 ok(1);
@@ -260,10 +261,26 @@ ok($xml, '<foo>&lt;
   </bar>
 </foo>');
 
+$x = XML::Generator->new();
+$xml = $x->foo('パスワードをお忘れの方');
+ok($xml, '<foo>パスワードをお忘れの方</foo>');
+
+$x = XML::Generator->new(':strict');
+$xml = $x->foo('パスワードをお忘れの方');
+ok($xml, '<foo>パスワードをお忘れの方</foo>');
+ok($xml, "<foo>\x{30D1}\x{30B9}\x{30EF}\x{30FC}\x{30C9}\x{3092}\x{304A}\x{5FD8}\x{308C}\x{306E}\x{65B9}</foo>");
+
+$x = XML::Generator->new(':strict', escape => 'high-bit');
+$xml = $x->foo('パスワードをお忘れの方');
+ok($xml, '<foo>&#12497;&#12473;&#12527;&#12540;&#12489;&#12434;&#12362;&#24536;&#12428;&#12398;&#26041;</foo>');
+
 $x = XML::Generator->new(':strict', escape => 'high-bit');
 $xml = $x->foo("\\<\242", $x->xmlpi('g'));
 ok($xml, '<foo><&#162;<?g?></foo>');
 
+$xml = $x->foo("\\<\x{2603}", $x->xmlpi('g'));
+ok($xml, '<foo><&#9731;<?g?></foo>');
+
 { my $w; local $SIG{__WARN__} = sub { $w .= $_[0] };
   $x = XML::Generator->new(':import');
   ok($w =~ /Useless use of/, 1); $w = '';