generic-library/rapidjson
1
0
Fork 0
mirror of https://github.com/Tencent/rapidjson.git synced 2025-03-08 18:41:19 +01:00
Code Issues Projects Releases Wiki Activity

Fix a bug in regex

Browse Source 
Due to dereferencing a pointer which may be invalidated
This commit is contained in:
Milo Yip 2016-04-17 11:59:09 +08:00
parent 8f4e99b2e5
commit be352d9548
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/rapidjson/internal/regex.h
View File

@ -468,17 +468,17 @@ private:
static SizeType Min(SizeType a, SizeType b) { return a < b ? a : b; } static SizeType Min(SizeType a, SizeType b) { return a < b ? a : b; }
void CloneTopOperand(Stack<Allocator>& operandStack) { void CloneTopOperand(Stack<Allocator>& operandStack) {
const Frag *src = operandStack.template Top<Frag>(); const Frag src = *operandStack.template Top<Frag>(); // Copy constructor to prevent invalidation
SizeType count = stateCount_ - src->minIndex; // Assumes top operand contains states in [src->minIndex, stateCount_) SizeType count = stateCount_ - src.minIndex; // Assumes top operand contains states in [src->minIndex, stateCount_)
State* s = states_.template Push<State>(count); State* s = states_.template Push<State>(count);
memcpy(s, &GetState(src->minIndex), count * sizeof(State)); memcpy(s, &GetState(src.minIndex), count * sizeof(State));
for (SizeType j = 0; j < count; j++) { for (SizeType j = 0; j < count; j++) {
if (s[j].out != kRegexInvalidState) if (s[j].out != kRegexInvalidState)
s[j].out += count; s[j].out += count;
if (s[j].out1 != kRegexInvalidState) if (s[j].out1 != kRegexInvalidState)
s[j].out1 += count; s[j].out1 += count;
} }
*operandStack.template Push<Frag>() = Frag(src->start + count, src->out + count, src->minIndex + count); *operandStack.template Push<Frag>() = Frag(src.start + count, src.out + count, src.minIndex + count);
stateCount_ += count; stateCount_ += count;
} }

5
test/unittest/regextest.cpp
View File

@ -584,4 +584,9 @@ TEST(Regex, Issue538) {
EXPECT_TRUE(re.IsValid()); EXPECT_TRUE(re.IsValid());
} }
TEST(Regex, Issue583) {
Regex re("[0-9]{99999}");
ASSERT_TRUE(re.IsValid());
}
#undef EURO #undef EURO