stas Tue Aug 5 05:15:31 2003 EDT
Modified files:
/php-src/ext/standard var_unserializer.re
Log:
don't try to wakeup incomplete classes
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.19
php-src/ext/standard/var_unserializer.re:1.20
--- php-src/ext/standard/var_unserializer.re:1.19 Wed Jul 2 12:19:57 2003
+++ php-src/ext/standard/var_unserializer.re Tue Aug 5 05:15:31 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.19 2003/07/02 16:19:57 moriyoshi Exp $ */
+/* $Id: var_unserializer.re,v 1.20 2003/08/05 09:15:31 stas Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -226,9 +226,11 @@
return 0;
}
- INIT_PZVAL(&fname);
- ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0);
- call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr, 0, 0, 1,
NULL TSRMLS_CC);
+ if(Z_OBJCE_PP(rval) != PHP_IC_ENTRY) {
+ INIT_PZVAL(&fname);
+ ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0);
+ call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr,
0, 0, 1, NULL TSRMLS_CC);
+ }
if (retval_ptr)
zval_ptr_dtor(&retval_ptr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
