[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_exceptions.c

[Pierre Joye]

pajoye   Tue, 06 Sep 2011 06:32:42 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=316210

Log:
- WS

Changed paths:
U   php/php-src/trunk/Zend/zend_exceptions.c

Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2011-09-06 06:32:00 UTC (rev 
316209)
+++ php/php-src/trunk/Zend/zend_exceptions.c2011-09-06 06:32:42 UTC (rev 
316210)
@@ -90,7 +90,6 @@

if (exception != NULL) {
zend_get_object_classname(exception, classname, 
name_len TSRMLS_CC);
-
DTRACE_EXCEPTION_THROWN(classname);
} else {
DTRACE_EXCEPTION_THROWN(NULL);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_exceptions.c

[Felipe Pena]

felipe   Wed, 17 Nov 2010 21:41:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305472

Log:
- Fixed bug #53306 (php crashes with segfault when DTrace exception-thrown 
probe fires)
  patch by: mike at harschsystems dot com

Bug: http://bugs.php.net/53306 (Assigned) php crashes with segfault when DTrace 
exception-thrown probe fires
  
Changed paths:
U   php/php-src/trunk/Zend/zend_exceptions.c

Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2010-11-17 20:46:44 UTC (rev 
305471)
+++ php/php-src/trunk/Zend/zend_exceptions.c2010-11-17 21:41:30 UTC (rev 
305472)
@@ -87,8 +87,13 @@
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 */


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_exceptions.c

[Antony Dovgal]

tony2001 Sun, 25 Apr 2010 19:17:16 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298550

Log:
fix ~450 tests and 25 segfaults
make test, anyone?

Changed paths:
U   php/php-src/trunk/Zend/zend_exceptions.c

Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2010-04-25 18:55:06 UTC (rev 
298549)
+++ php/php-src/trunk/Zend/zend_exceptions.c2010-04-25 19:17:16 UTC (rev 
298550)
@@ -90,6 +90,7 @@
zend_get_object_classname(exception, classname, name_len);
DTRACE_EXCEPTION_THROWN(classname);
}
+#endif /* HAVE_DTRACE */

if (exception != NULL) {
zval *previous = EG(exception);
@@ -102,7 +103,6 @@
if (!EG(current_execute_data)) {
zend_error(E_ERROR, Exception thrown without a stack frame);
}
-#endif /* HAVE_DTRACE */

if (zend_throw_exception_hook) {
zend_throw_exception_hook(exception TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: php/php-src/trunk/Zend/ zend_exceptions.c

[Felipe Pena]

felipe  Sun, 19 Jul 2009 14:19:32 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284351

Changed paths:
U   php/php-src/trunk/Zend/zend_exceptions.c

Log:
- Fixed ZTS build

Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2009-07-19 14:00:25 UTC (rev 
284350)
+++ php/php-src/trunk/Zend/zend_exceptions.c2009-07-19 14:19:32 UTC (rev 
284351)
@@ -89,7 +89,7 @@
int name_len, s_classname_len;

classname = NULL_ZSTR;
-   zend_get_object_classname(exception, classname, name_len);
+   zend_get_object_classname(exception, classname, name_len 
TSRMLS_CC);
zend_unicode_to_string(ZEND_U_CONVERTER(UG(utf8_conv)), 
s_classname, s_classname_len, classname.u, u_strlen(classname.u) TSRMLS_CC);

DTRACE_EXCEPTION_THROWN(s_classname);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php