From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 12 Sep 2005 07:14:54 +0000 (+0000)
Subject: Fix for exceptions in __sleep()
X-Git-Tag: RELEASE_0_9_0~237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4a3454c522a6a32acfe33eddbb975c5cf479fee;p=php

Fix for exceptions in __sleep()
---

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 8486cc8451..4fbead5034 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -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,