summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2010-04-01 19:36:56 (GMT)
committerStanislav Malyshev <stas@php.net>2010-04-01 19:36:56 (GMT)
commitcf4ea31bff28d0a3683a1dceb81047111ab32ca8 (patch)
treed6c2689a3d93de26880defdb6d550d4a79c2a8e7 /Zend
parent49b8860acebe5c93d577004a447d0bf68ec74964 (diff)
downloadphp-cf4ea31bff28d0a3683a1dceb81047111ab32ca8.tar.gz
fix #51394 - try harder to find script lineno when exception happens
Diffstat (limited to 'Zend')
-rw-r--r--Zend/tests/bug51394.phpt16
-rw-r--r--Zend/zend_execute_API.c4
2 files changed, 20 insertions, 0 deletions
diff --git a/Zend/tests/bug51394.phpt b/Zend/tests/bug51394.phpt
new file mode 100644
index 0000000..537574c
--- /dev/null
+++ b/Zend/tests/bug51394.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #51394 (Error line reported incorrectly if error handler throws an exception)
+--INI--
+error_reporting=-1
+--FILE--
+<?php
+function eh()
+{
+ throw new Exception("error!");
+ return false;
+}
+
+set_error_handler("eh");
+$a = $empty($b);
+--EXPECTF--
+Fatal error: Function name must be a string in %sbug51394.php on line 9 \ No newline at end of file
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 55d0ab7..1865b6c 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 {