diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-10 10:04:30 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-10 10:04:30 +0400 |
| commit | f4cfaf36e23ca47da3e352e1c60909104c059647 (patch) | |
| tree | 0db3e2a323b12c5bbf1a958c857f92eb58c240d1 /Zend/zend_alloc.c | |
| parent | 89a9acea1f9d821a9805b3857bf4febbba08690d (diff) | |
| download | php-git-f4cfaf36e23ca47da3e352e1c60909104c059647.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index f621487819..3e94ae0bd6 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1758,10 +1758,11 @@ static void zend_mm_safe_error(zend_mm_heap *heap, uint error_lineno; TSRMLS_FETCH(); if (zend_is_compiling(TSRMLS_C)) { - error_filename = zend_get_compiled_filename(TSRMLS_C); + zend_string *str = zend_get_compiled_filename(TSRMLS_C); + error_filename = str ? str->val : NULL; error_lineno = zend_get_compiled_lineno(TSRMLS_C); } else if (EG(in_execution)) { - error_filename = EG(active_op_array)?EG(active_op_array)->filename:NULL; + error_filename = EG(active_op_array)?EG(active_op_array)->filename->val:NULL; error_lineno = EG(opline_ptr)?(*EG(opline_ptr))->lineno:0; } else { error_filename = NULL; |