Changeset 323

Timestamp:

08/14/07 13:02:03 (11 months ago)

Author:

hans

Message:

Fix for #242

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/optimize.c (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2007-08-14  Hans Rakers <hans at react.nl>
+
+        * Optimizer fix for #242. PHP-5.2.1 introduces a ZEND_JMP before a
+          ZEND_FETCH_CLASS/ZEND_CATCH which the optimizer did not handle
+          correctly, resulting in uncaught exceptions. (Thanks to warwickshaw)
+
-2007-05-09  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/optimize.c

@@ -2976 +2976 @@
-                                                op->extended_value = 0;
-                                        }
+#  if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2 && PHP_RELEASE_VERSION >= 1) || PHP_MAJOR_VERSION >= 6
+                                        /* php > 5.2.1 introduces a ZEND_JMP before a ZEND_FETCH_CLASS and ZEND_CATCH
+                                           this leaves those blocks intact */
+                                        else if ((op+1)->opcode == ZEND_FETCH_CLASS && (op+2)->opcode == ZEND_CATCH) { /* fix for #242 */
+                                                p->follow = &bb[line_num];
+                                        }
+#  endif
-#endif
-                                        break;