Changeset 13167

Timestamp:

2006-10-27T12:15:07+13:00 (18 years ago)

Author:

mdewsnip

Message:

Now escapes the '&' characters in the CGI arguments in XML errors or warnings, to prevent XML parsing errors.

File:

• trunk/gsdl/cgi-bin/gsdlCGI.pm (modified) (2 diffs)

trunk/gsdl/cgi-bin/gsdlCGI.pm

@@ -83 +83 @@
 
     if ($xml) {
+    # Make $args XML safe
+    my $args_xml_safe = $args;
+    $args_xml_safe =~ s/&/&/g;
+
     $full_mess =  "<Error>\n";
     $full_mess .= "  $mess\n";
-    $full_mess .= "  CGI args were: $args\n";
+    $full_mess .= "  CGI args were: $args_xml_safe\n";
     $full_mess .= "</Error>\n";
     }
@@ -109 +113 @@
 
     if ($xml) {
+    # Make $args XML safe
+    my $args_xml_safe = $args;
+    $args_xml_safe =~ s/&/&amp;/g;
+
     $full_mess =  "<Warning>\n";
     $full_mess .= "  $mess\n";
-    $full_mess .= "  CGI args were: $args\n";
+    $full_mess .= "  CGI args were: $args_xml_safe\n";
     $full_mess .= "</Warning>\n";
     }