Stop URLs at " too. Thanks to Vincent Lefevre (Closes: #766354).

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index d085ed4fb76681c4ca9f20a6ce1dabea01f177c8..00619fc47a70d99a0b1c50fc9575760a510e576c 100644 (file)
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -271,7 +271,7 @@ sub display_entity {
         # We don't html escape here because we escape above;
         # wierd terminators are because of that
         $body =~ s{((?:ftp|http|https|svn|ftps|rsync)://[\S~-]+?/?) # Url
         # We don't html escape here because we escape above;
         # wierd terminators are because of that
         $body =~ s{((?:ftp|http|https|svn|ftps|rsync)://[\S~-]+?/?) # Url

-                   ((?:\&gt\;)?[)]?(?:'|\&\#39\;)?[:.\,]?(?:\s|$)) # terminators
+                   ((?:\&gt\;)?[)]?(?:'|\&\#39\;|\&quot\;)?[:.\,]?(?:\s|$)) # terminators

              }{<a href=\"$1\">$1</a>$2}gox;
         # Add links to bug closures
         $body =~ s[((?:closes|see):\s* # start of closed/referenced bugs
              }{<a href=\"$1\">$1</a>$2}gox;
         # Add links to bug closures
         $body =~ s[((?:closes|see):\s* # start of closed/referenced bugs

diff --git a/debian/changelog b/debian/changelog
index 7f8ef530b64208efd609875f3eb52d92a29c179c..24d201462ba37b30ed307b0abcc7ef7dbc1f8dd5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
     #412815). Thanks to martin krafft, Paul Wise, and Julien Valroff.
   * Fix XSS in version.cgi, thanks to Vlad Constantin (Closes: #762967).
   * Add affects to bugreport.cgi package info header (Closes: #609687).
     #412815). Thanks to martin krafft, Paul Wise, and Julien Valroff.
   * Fix XSS in version.cgi, thanks to Vlad Constantin (Closes: #762967).
   * Add affects to bugreport.cgi package info header (Closes: #609687).

+  * Stop URLs at " too. Thanks to Vincent Lefevre (Closes: #766354).

 
   [Thanks to Arnout Engelen: ]
   * Add Homepage (closes: #670555).
 
   [Thanks to Arnout Engelen: ]
   * Add Homepage (closes: #670555).