From cf4ea31bff28d0a3683a1dceb81047111ab32ca8 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Thu, 1 Apr 2010 19:36:56 +0000 Subject: fix #51394 - try harder to find script lineno when exception happens --- Zend/zend_execute_API.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Zend/zend_execute_API.c') diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 55d0ab72ca..1865b6cbf9 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -411,6 +411,10 @@ ZEND_API char *zend_get_executed_filename(TSRMLS_D) /* {{{ */ ZEND_API uint zend_get_executed_lineno(TSRMLS_D) /* {{{ */ { + if(EG(exception) && EG(opline_ptr) && active_opline->opcode == ZEND_HANDLE_EXCEPTION && + active_opline->lineno == 0 && EG(opline_before_exception)) { + return EG(opline_before_exception)->lineno; + } if (EG(opline_ptr)) { return active_opline->lineno; } else { -- cgit v1.2.1