com php-src: Fix bug #74087: ext/pcre/pcrelib/pcre_jit_comp ile.c
| From: | Stanislav Malyshev | Date: | Wed, 05 Jul 2017 02:21: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-98345@lists.php.net to get a copy of this message | ||
Commit: f7f4fd470635c30018d7ac71ab3b848195bf8795
Author: Stanislav Malyshev <stas@php.net> Tue, 4 Jul 2017 19:21:28 -0700
Parents: e8b7698f5ee757ce2c8bd10a192a491a498f891c
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f7f4fd470635c30018d7ac71ab3b848195bf8795
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)