Fix RT issue 80273

Author: timlegge

Generator.pm

@@ -708,9 +708,9 @@ sub xmlpi {
      while (my($k, $v) = each %atts) {
        $this->XML::Generator::util::ck_syntax($k);
        XML::Generator::util::escape($v,
-                XML::Generator::util::ESCAPE_FILTER_INVALID_CHARS() |
                 XML::Generator::util::ESCAPE_ATTR() |
                 $this->{'escape'});
+       XML::Generator::util::filter($v);
        $xml .= qq{ $k="$v"};
      }
   }
@@ -1133,9 +1133,7 @@ sub c_tag {
              : $arg->{'pretty'}
                ? " " x $arg->{'pretty'}
                : "";
-  if ($arg->{'filter_invalid_chars'}) {
-    $escape |= ESCAPE_FILTER_INVALID_CHARS;
-  }
+  my $filter = $arg->{'filter_invalid_chars'};
 
   my $blessClass = $indent ? 'XML::Generator::pretty' : 'XML::Generator::overload';
 
@@ -1156,11 +1154,12 @@ sub c_tag {
     }
 
     # Deal with escaping if required
-   if ($escape) {
+   if ($escape || $filter) {
       if ($attr) {
 	foreach my $key (keys %{$attr}) {
 	  next unless defined($attr->{$key});
 	  XML::Generator::util::escape($attr->{$key}, ESCAPE_ATTR() | $escape);
+	  XML::Generator::util::filter($attr->{$key}) if ($filter);
 	}
       }
       for (@args) {
@@ -1171,7 +1170,8 @@ sub c_tag {
 	  # un-ref it
 	  $_ = $$_;
 	} elsif (! UNIVERSAL::isa($_, 'XML::Generator::overload') ) {
-	  XML::Generator::util::escape($_, $escape);
+	  XML::Generator::util::escape($_, $escape) if $escape ;
+	  XML::Generator::util::filter($_) if $filter;
 	}
       }
     } else {
@@ -1401,9 +1401,6 @@ sub escape {
   if ($f & ESCAPE_HIGH_BIT) {
     $_[0] =~ s/([\200-\377])/'&#'.ord($1).';'/ge;
   }
-  if ($f & ESCAPE_FILTER_INVALID_CHARS) {
-    filter($_[0]);
-  }
 }
 
 sub filter { $_[0] =~ tr/\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F\x80\x81\x82\x83\x84\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F//d }

t/Issue-80273.t

@@ -0,0 +1,80 @@
+use strict;
+
+use Test::More qw/ tests 1 /;
+
+use XML::Generator;
+
+my $XML = XML::Generator->new(conformance => "strict");
+
+my $result = $XML->record(join "\n", map { my ($k, $v) = @{$_}; $XML->$k($v); }
+                (
+                    [threat => 1],
+                    [desc => "godzilla"],
+                    [value => "http://y.ahoooooooooo.it/0weifjwef"],
+                    [detected => "2012-10-16 00:00:00"]
+                ));
+
+my $expected_result = '<record><threat>1</threat>
+<desc>godzilla</desc>
+<value>http://y.ahoooooooooo.it/0weifjwef</value>
+<detected>2012-10-16 00:00:00</detected></record>';
+
+ok($result eq $expected_result, 'Got expected results');
+exit;
+$XML = XML::Generator->new();
+
+$result = $XML->record(
+                    join "\n", map { my ($k, $v) = @{$_}; $XML->$k($v); }
+                    (
+                        [threat => 1],
+                        [desc => "gozdilla"],
+                        [value => "http://y.ahoooooooooo.it/0weifjwef"],
+                        [detected => "2012-10-16 00:00:00"]
+                    ));
+
+$expected_result = '<record><threat>1</threat>
+<desc>gozdilla</desc>
+<value>http://y.ahoooooooooo.it/0weifjwef</value>
+<detected>2012-10-16 00:00:00</detected></record>';
+
+ok($result eq $expected_result, 'Got expected results');
+
+my $XML = XML::Generator->new(conformance => "strict", pretty => 1);
+
+$result = $XML->record(
+                        map { my ($k, $v) = @{$_}; $XML->$k($v); }
+                        (
+                            [threat => 1],
+                            [desc => "godzilla"],
+                            [value => "http://y.ahoooooooooo.it/0weifjwef"],
+                            [detected => "2012-10-16 00:00:00"]
+                        ));
+
+$expected_result = '<record>
+ <threat>1</threat>
+ <desc>godzilla</desc>
+ <value>http://y.ahoooooooooo.it/0weifjwef</value>
+ <detected>2012-10-16 00:00:00</detected>
+</record>';
+
+ok($result eq $expected_result, 'Got expected results');
+
+$XML = XML::Generator->new(conformance => "strict", pretty => 1);
+
+$result = $XML->record(
+                map { my ($k, $v) = @{$_}; $XML->$k($v); }
+                (
+                    [threat => 1],
+                    [desc => "godzilla"],
+                    [value => "http://y.ahoooooooooo.it/0weifjwef"],
+                    [detected => "2012-10-16 00:00:00"]
+                ));
+
+$expected_result = '<record>
+ <threat>1</threat>
+ <desc>godzilla</desc>
+ <value>http://y.ahoooooooooo.it/0weifjwef</value>
+ <detected>2012-10-16 00:00:00</detected>
+</record>';
+
+ok($result eq $expected_result, 'Got expected results');