diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-18 17:24:16 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-18 17:24:16 -0700 |
| commit | ecd67ed3e5a1c62fdf879a38c500e01ef453d0be (patch) | |
| tree | 05c5a1ad7ee8e7fc7648bf129f79eee566a71f28 | |
| parent | 12c2a8a5eb97049ec0f68369dfe8516ffde87bf3 (diff) | |
| parent | bcf785fb6667194ff70ef6f903189a495c15eb40 (diff) | |
| download | php-git-ecd67ed3e5a1c62fdf879a38c500e01ef453d0be.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
| -rw-r--r-- | Zend/zend.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 89649bf030..f9069c8e1b 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1092,17 +1092,19 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ error_filename = "Unknown"; } - va_start(args, format); - #ifdef HAVE_DTRACE if(DTRACE_ERROR_ENABLED()) { char *dtrace_error_buffer; + va_start(args, format); zend_vspprintf(&dtrace_error_buffer, 0, format, args); DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno); efree(dtrace_error_buffer); + va_end(args); } #endif /* HAVE_DTRACE */ + va_start(args, format); + /* if we don't have a user defined error handler */ if (!EG(user_error_handler) || !(EG(user_error_handler_error_reporting) & type) |