summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/zend_exceptions.c9
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 */