From: Express50 Date: Sun, 9 Mar 2014 17:42:01 +0000 (-0400) Subject: Fix URL regex X-Git-Tag: 0.10-rc1~6^2 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c1559056803360cc528c578e3458a0bae33bd56c Fix URL regex Removes unwise characters from URL regex. These characters should be percent escaped according to RFC 2396. Fixes #1243 --- diff --git a/src/uisupport/clickable.cpp b/src/uisupport/clickable.cpp index 7acd8e22..3b32f267 100644 --- a/src/uisupport/clickable.cpp +++ b/src/uisupport/clickable.cpp @@ -55,7 +55,7 @@ ClickableList ClickableList::fromString(const QString &str) // For matching URLs static QString scheme("(?:(?:mailto:|(?:[+.-]?\\w)+://)|www(?=\\.\\S+\\.))"); static QString authority("(?:(?:[,.;@:]?[-\\w]+)+\\.?|\\[[0-9a-f:.]+\\])(?::\\d+)?"); - static QString urlChars("(?:[,.;:]*[\\w~@/?&=+$()!%#*{}\\[\\]\\|'^-])"); + static QString urlChars("(?:[,.;:]*[\\w~@/?&=+$()!%#*-])"); static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)"); static QRegExp regExp[] = {