]> granicus.if.org Git - php/commitdiff
Fixed access to wrong opline (it may be the last ZEND_THROW in op_array->opcodes)
authorDmitry Stogov <dmitry@zend.com>
Wed, 20 May 2015 19:49:37 +0000 (22:49 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 20 May 2015 19:49:37 +0000 (22:49 +0300)
Zend/zend_exceptions.c

index 023836e4f124f103c7ca5b5f8d31f0f9df97cc2b..e8c0706cf0a9e235c2b37a8e0eb0a5fe42168e4d 100644 (file)
@@ -125,7 +125,7 @@ ZEND_API void zend_throw_exception_internal(zval *exception) /* {{{ */
 
        if (!EG(current_execute_data)->func ||
            !ZEND_USER_CODE(EG(current_execute_data)->func->common.type) ||
-           (EG(current_execute_data)->opline+1)->opcode == ZEND_HANDLE_EXCEPTION) {
+           EG(current_execute_data)->opline->opcode == ZEND_HANDLE_EXCEPTION) {
                /* no need to rethrow the exception */
                return;
        }