===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.4
retrieving revision 4.9
diff -u -p -r4.4 -r4.9
--- cvsweb/cvsweb.cgi	2019/11/09 09:19:27	4.4
+++ cvsweb/cvsweb.cgi	2019/11/09 10:06:23	4.9
@@ -1,5 +1,5 @@
-#!/usr/bin/perl -T
-# $Id: cvsweb.cgi,v 4.4 2019/11/09 09:19:27 schwarze Exp $
+#!/usr/bin/perl
+# $Id: cvsweb.cgi,v 4.9 2019/11/09 10:06:23 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -50,7 +50,6 @@
 require 5.006;
 
 use strict;
-
 use warnings;
 use filetest qw(access);
 
@@ -114,7 +113,7 @@ use constant HAS_EDIFF    => eval { require String::Ed
 
 BEGIN
 {
-  $VERSION = '3.0.6';
+  $VERSION = '3.1';
 
   $HTML_DOCTYPE =
     '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ' .
@@ -359,9 +358,17 @@ if (defined($ENV{QUERY_STRING})) {
     $p =~ y/+/ /;
     my ($key, $val) = split(/=/, $p, 2);
     next unless defined($key);
-    $val = 1 unless defined($val);
-    ($key = uri_unescape($key)) =~ /[[:graph:]]/ or next;
-    ($val = uri_unescape($val)) =~ /[[:graph:]]/ or next;
+    $key = uri_unescape($key);
+    $key =~ /([^a-z_12-])/ and fatal('404 Not Found',
+      'Invalid character "%s" in query parameter "%s"', $1, $key);
+    if (defined $val) {
+      $val = uri_unescape($val);
+      $val =~ /([^a-zA-Z_01-9.\/-])/ and fatal('404 Not Found',
+        'Invalid character "%s" in the value "%s" of the query parameter "%s"',
+        $1, $value, $key);
+    } else {
+      $val = 1;
+    }
     $query{$key} = $val;
   }
 }
@@ -1541,7 +1548,7 @@ sub htmlify($;$)
          }{
             my($text, $name, $section) = ($1, $2, defined($3) ? $3 : $4);
             ($name =~ /[A-Za-z]/ && $name !~ /\.(:|$)/)
-             ? &link($text, sprintf($mancgi, $section, uri_escape($name)))
+             ? &link($text, sprintf($mancgi, uri_escape($name), $section))
               : $text;
          }egx;
       } $_;
@@ -4195,6 +4202,7 @@ sub htmlquote($)
   # Special Characters; RFC 1866
   s/&/&amp;/g;
   s/\"/&quot;/g;
+  s/%22/&quot;/g;
   s/</&lt;/g;
   s/>/&gt;/g;
   return $_;
