wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-24 14:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Tokenizer: don't strip backslashes from \x"

Browse source
This commit is contained in:
jenkins-bot 2019-11-22 13:36:49 +00:00 committed by Gerrit Code Review
parent 8bed72cfd6 c73381b6db
commit 2d2e524dca
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/parser/AbuseFilterTokenizer.php
View file

@ -7,7 +7,7 @@ use Psr\Log\LoggerInterface;
*/
class AbuseFilterTokenizer {
/** @var int Tokenizer cache version. Increment this when changing the syntax. **/
const CACHE_VERSION = 2;
const CACHE_VERSION = 3;
const COMMENT_START_RE = '/\s*\/\*/A';
const ID_SYMBOL_RE = '/[0-9A-Za-z_]+/A';
const OPERATOR_RE =
@ -307,7 +307,7 @@ class AbuseFilterTokenizer {
// \xXX -- 2 done later
$offset += 2;
} else {
$token .= 'x';
$token .= '\\x';
}
break;
default:

7
tests/parserTests/string.t
View file

@ -3,4 +3,9 @@
"a\"b" === 'a"b' &
"a\rb" !== "a\r\nb" &
"\x66\x6f\x6f" === "foo" &
"some\xstring" === "somexstring"
"some\xstring" === "some\\xstring" &
"some\vstring" === "some\\vstring" &
/* T238475 */
'\x{}' === '\x' + '{}' &
length('\x{}') === 4 &
'foobar' rlike '[\x{61}-\x{7a}]'