properly encode utf8 status fields when version is 3

[debbugs.git] / Debbugs / CGI / Bugreport.pm

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index ba4c7a4f30ee3185b9eb5dc377a177bc914b18da..8589ac9a71f971217472b2cd8c749d27f52b0a44 100644 (file)
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -35,6 +35,7 @@ use Params::Validate qw(validate_with :types);
 use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message);
 use Debbugs::CGI qw(:url :html :util);
 use Debbugs::Common qw(globify_scalar english_join);
+use Debbugs::Config qw(:config);
 use POSIX qw(strftime);
 
 BEGIN{
@@ -255,8 +256,8 @@ sub display_entity {
             length $config{cve_tracker}
            ) {
             # Add links to CVE vulnerabilities (closes #568464)
-            $body =~ s{(CVE-\d{4}-\d{4,})}
-                      {<a href="http://$config{cve_tracker}$1">$1</a>}gx;
+            $body =~ s{(^|\s)(CVE-\d{4}-\d{4,})(\s|[,.-\[\]]|$)}
+                      {$1<a href="http://$config{cve_tracker}$2">$2</a>$3}gxm;
         }
         if (not exists $param{att}) {
              print {$param{output}} qq(<pre class="message">$body</pre>\n);