walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix JIT assertion failure.

This commit is contained in:
Zoltán Herczeg 2015-04-21 07:02:08 +00:00
parent 53e25208d3
commit c8609a72c6
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pcre2_jit_compile.c
View File

@ -1541,6 +1541,15 @@ while (cc < ccend)
switch(*cc) switch(*cc)
{ {
case OP_KET: case OP_KET:
if (PRIVATE_DATA(cc) != 0)
{
private_data_length++;
SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
cc += PRIVATE_DATA(cc + 1);
}
cc += 1 + LINK_SIZE;
break;
case OP_ASSERT: case OP_ASSERT:
case OP_ASSERT_NOT: case OP_ASSERT_NOT:
case OP_ASSERTBACK: case OP_ASSERTBACK:
@ -1551,8 +1560,8 @@ while (cc < ccend)
case OP_SBRA: case OP_SBRA:
case OP_SBRAPOS: case OP_SBRAPOS:
case OP_SCOND: case OP_SCOND:
if (PRIVATE_DATA(cc) != 0)
private_data_length++; private_data_length++;
SLJIT_ASSERT(PRIVATE_DATA(cc) != 0);
cc += 1 + LINK_SIZE; cc += 1 + LINK_SIZE;
break; break;
@ -1711,6 +1720,16 @@ do
switch(*cc) switch(*cc)
{ {
case OP_KET: case OP_KET:
if (PRIVATE_DATA(cc) != 0)
{
count = 1;
srcw[0] = PRIVATE_DATA(cc);
SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
cc += PRIVATE_DATA(cc + 1);
}
cc += 1 + LINK_SIZE;
break;
case OP_ASSERT: case OP_ASSERT:
case OP_ASSERT_NOT: case OP_ASSERT_NOT:
case OP_ASSERTBACK: case OP_ASSERTBACK:
@ -1721,11 +1740,9 @@ do
case OP_SBRA: case OP_SBRA:
case OP_SBRAPOS: case OP_SBRAPOS:
case OP_SCOND: case OP_SCOND:
if (PRIVATE_DATA(cc) != 0)
{
count = 1; count = 1;
srcw[0] = PRIVATE_DATA(cc); srcw[0] = PRIVATE_DATA(cc);
} SLJIT_ASSERT(srcw[0] != 0);
cc += 1 + LINK_SIZE; cc += 1 + LINK_SIZE;
break; break;