diff options
| author | Felipe Pena <felipe@php.net> | 2010-11-17 21:41:30 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-11-17 21:41:30 +0000 |
| commit | 45189fa8030b8d1df48c9dcfeb49fb119d6b1ab5 (patch) | |
| tree | 0d0b88367d0eb2005bfef31379b53f35a2395a9c | |
| parent | 46ef2edf8d75b43cdfa3918c81d0ce90b6abcb24 (diff) | |
| download | php-git-45189fa8030b8d1df48c9dcfeb49fb119d6b1ab5.tar.gz | |
- Fixed bug #53306 (php crashes with segfault when DTrace "exception-thrown" probe fires)
patch by: mike at harschsystems dot com
| -rw-r--r-- | Zend/zend_exceptions.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index adfef3f3d1..bcc492d2f3 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -87,8 +87,13 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */ if (DTRACE_EXCEPTION_THROWN_ENABLED()) { char *classname; int name_len; - zend_get_object_classname(exception, &classname, &name_len); - DTRACE_EXCEPTION_THROWN(classname); + + if (exception != NULL) { + zend_get_object_classname(exception, &classname, &name_len); + DTRACE_EXCEPTION_THROWN(classname); + } else { + DTRACE_EXCEPTION_THROWN(NULL); + } } #endif /* HAVE_DTRACE */ |