github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-09-30 03:34:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rework parser rejection for POSIX collating elems

Browse Source 
Implement rejection of POSIX collating elements ("[.ch.]" and "[=ch=]"
entirely in the Ragel parser, using the same approach both inside and
ouside character classes.

Fix buggy rejection of [^.ch.], which we should accept as a character
class.
This commit is contained in:
Justin Viiret
2015-11-09 10:37:20 +11:00
committed by Matthew Barr
parent d9efe07125
commit 9a7b912a5d
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/parser/Parser.rl
View File

@@ -790,10 +790,12 @@ unichar readUtf8CodePoint4c(const u8 *ts) {
any => { throw LocatedParseError("Unknown property"); };
*|;
charClassGuts := |*
# We don't like POSIX collating elements (neither does PCRE or Perl).
'\[\.' [^\]]* '\.\]' |
'\[=' [^\]]* '=\]' => {
throw LocatedParseError("Unsupported POSIX collating element");
# We don't support POSIX collating elements (neither does PCRE
# or Perl). These look like [.ch.] or [=ch=].
'\[\.' ( '\\]' | [^\]] )* '\.\]' |
'\[=' ( '\\]' | [^\]] )* '=\]' => {
throw LocatedParseError("Unsupported POSIX collating "
"element");
};
# Named sets
# Adding these may cause the charclass to close, hence the
@@ -1090,23 +1092,6 @@ unichar readUtf8CodePoint4c(const u8 *ts) {
throwInvalidUtf8();
};
# dot or equals at the end of a character class could be the end
# of a collating element, like [.blah.] or [=blah=].
[.=] ']' => {
if (currentCls->getFirstChar() == *ts) {
assert(currentClsBegin);
ostringstream oss;
oss << "Unsupported POSIX collating element at index "
<< currentClsBegin - ptr << ".";
throw ParseError(oss.str());
}
currentCls->add(*ts);
currentCls->finalize();
currentSeq->addComponent(move(currentCls));
inCharClass = false;
fgoto main;
};
# Literal character
(any - ']') => {
if (currentCls->class_empty()) {
@@ -1232,6 +1217,13 @@ unichar readUtf8CodePoint4c(const u8 *ts) {
throw LocatedParseError("POSIX named classes are only "
"supported inside a class");
};
# We don't support POSIX collating elements (neither does PCRE
# or Perl). These look like [.ch.] or [=ch=].
'\[\.' ( '\\]' | [^\]] )* '\.\]' |
'\[=' ( '\\]' | [^\]] )* '=\]' => {
throw LocatedParseError("Unsupported POSIX collating "
"element");
};
# Begin eating characters for class
'\[' => eatClass;
# Begin quoted literal