]> granicus.if.org Git - php/commitdiff
Fix for exceptions in __sleep()
authorDmitry Stogov <dmitry@php.net>
Mon, 12 Sep 2005 07:14:54 +0000 (07:14 +0000)
committerDmitry Stogov <dmitry@php.net>
Mon, 12 Sep 2005 07:14:54 +0000 (07:14 +0000)
ext/standard/var.c

index 8486cc84511ba60f548305f1c43dd9e13d20d3b2..4fbead50341535a46950d031d8b4b11461ad28e5 100644 (file)
@@ -933,7 +933,7 @@ static void php_var_serialize_intern(smart_str *buf, zval **struc, HashTable *va
                                        res = call_user_function_ex(CG(function_table), struc, &fname, 
                                                                                                &retval_ptr, 0, 0, 1, NULL TSRMLS_CC);
 
-                                       if (res == SUCCESS) {
+                                       if (res == SUCCESS && !EG(exception)) {
                                                if (retval_ptr) {
                                                        if (HASH_OF(retval_ptr)) {
                                                                php_var_serialize_class(buf, struc, retval_ptr,