[Pcre-svn] [1680] code/trunk: Fix a missing else in the JIT …

Top Page
Delete this message
Author: Subversion repository
Date:  
To: pcre-svn
Subject: [Pcre-svn] [1680] code/trunk: Fix a missing else in the JIT compiler reported by ' idaifish'.
Revision: 1680
          http://vcs.pcre.org/viewvc?view=rev&revision=1680
Author:   zherczeg
Date:     2017-02-14 08:48:18 +0000 (Tue, 14 Feb 2017)
Log Message:
-----------
Fix a missing else in the JIT compiler reported by 'idaifish'.


Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/pcre_jit_compile.c
    code/trunk/testdata/testinput12
    code/trunk/testdata/testoutput12


Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2017-02-12 13:28:11 UTC (rev 1679)
+++ code/trunk/ChangeLog    2017-02-14 08:48:18 UTC (rev 1680)
@@ -15,7 +15,9 @@
 next line instead of moving on to the end of the matched string, which can be 
 several lines after the start.


+3. Fix a missing else in the JIT compiler reported by 'idaifish'.

+
Version 8.40 11-January-2017
----------------------------


Modified: code/trunk/pcre_jit_compile.c
===================================================================
--- code/trunk/pcre_jit_compile.c    2017-02-12 13:28:11 UTC (rev 1679)
+++ code/trunk/pcre_jit_compile.c    2017-02-14 08:48:18 UTC (rev 1680)
@@ -8110,7 +8110,7 @@


     if (*matchingpath == OP_FAIL)
       stacksize = 0;
-    if (*matchingpath == OP_RREF)
+    else if (*matchingpath == OP_RREF)
       {
       stacksize = GET2(matchingpath, 1);
       if (common->currententry == NULL)


Modified: code/trunk/testdata/testinput12
===================================================================
--- code/trunk/testdata/testinput12    2017-02-12 13:28:11 UTC (rev 1679)
+++ code/trunk/testdata/testinput12    2017-02-14 08:48:18 UTC (rev 1680)
@@ -104,4 +104,6 @@
 /(.|.)*?bx/
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax


+/((?(?!))x)(?'name')(?1)/S++
+
/-- End of testinput12 --/

Modified: code/trunk/testdata/testoutput12
===================================================================
--- code/trunk/testdata/testoutput12    2017-02-12 13:28:11 UTC (rev 1679)
+++ code/trunk/testdata/testoutput12    2017-02-14 08:48:18 UTC (rev 1680)
@@ -201,4 +201,6 @@
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax
 Error -8 (match limit exceeded)


+/((?(?!))x)(?'name')(?1)/S++
+
/-- End of testinput12 --/