mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge pull request #3077
Closes #3075. Andrew Morgan (1): Prevent regex capture from extended past line boundaries.
This commit is contained in:
commit
dde56c99ec
|
@ -249,7 +249,7 @@ QString ChatMessage::detectAnchors(const QString &str)
|
||||||
"(?:\\b)((www\\.)|(http[s]?|ftp)://)" // (protocol)://(printable - non-special character)
|
"(?:\\b)((www\\.)|(http[s]?|ftp)://)" // (protocol)://(printable - non-special character)
|
||||||
// http://ONEORMOREALHPA-DIGIT
|
// http://ONEORMOREALHPA-DIGIT
|
||||||
"\\w+\\S+)" // any other character, lets domains and other
|
"\\w+\\S+)" // any other character, lets domains and other
|
||||||
"|(?:\\b)(file:///.*$)" //link to a local file, valid until the end of the line
|
"|(?:\\b)(file:///)([\\S| ]*)" //link to a local file, valid until the end of the line
|
||||||
"|(?:\\b)(tox:[a-zA-Z\\d]{76}$)" //link with full user address
|
"|(?:\\b)(tox:[a-zA-Z\\d]{76}$)" //link with full user address
|
||||||
"|(?:\\b)(mailto:\\S+@\\S+\\.\\S+)" //@mail link
|
"|(?:\\b)(mailto:\\S+@\\S+\\.\\S+)" //@mail link
|
||||||
"|(?:\\b)(tox:\\S+@\\S+)"); // starts with `tox` then : and only alpha-digits till the end
|
"|(?:\\b)(tox:\\S+@\\S+)"); // starts with `tox` then : and only alpha-digits till the end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user