com php-src: Fix bug #74087: ext/pcre/pcrelib/pcre_jit_comp ile.c
| From: | Joe Watkins | Date: | Thu, 06 Jul 2017 08:49:28 +0000 |
| Subject: | com php-src: Fix bug #74087: ext/pcre/pcrelib/pcre_jit_comp ile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98431@lists.php.net to get a copy of this message | ||
Commit: 73915a2bd61f21fd809b4d50af9aba950f43e807
Author: Stanislav Malyshev <stas@php.net> Tue, 4 Jul 2017 19:21:28 -0700
Committer: Joe Watkins <krakjoe@php.net> Thu, 6 Jul 2017 09:49:28 +0100
Parents: 61ba5f84774938617f78d65c06e5933cff2d8af3
Branches: PHP-7.1.7
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=73915a2bd61f21fd809b4d50af9aba950f43e807
Log:
Fix bug #74087
Ported from https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch
Bugs:
https://bugs.php.net/74087
Changed paths:
M ext/pcre/pcrelib/pcre_jit_compile.c
Diff:
diff --git a/ext/pcre/pcrelib/pcre_jit_compile.c b/ext/pcre/pcrelib/pcre_jit_compile.c
index 445de0c..4684be7 100644
--- a/ext/pcre/pcrelib/pcre_jit_compile.c
+++ b/ext/pcre/pcrelib/pcre_jit_compile.c
@@ -7307,7 +7307,7 @@ if (opcode == OP_COND || opcode == OP_SCOND)
if (*matchingpath == OP_FAIL)
stacksize = 0;
- if (*matchingpath == OP_RREF)
+ else if (*matchingpath == OP_RREF)
{
stacksize = GET2(matchingpath, 1);
if (common->currententry == NULL)