summaryrefslogtreecommitdiff
path: root/ext/standard/var_unserializer.re
diff options
context:
space:
mode:
authorSVN Migration <svn@php.net>2002-09-08 15:38:45 +0000
committerSVN Migration <svn@php.net>2002-09-08 15:38:45 +0000
commite94c67742f6f4bf9fe9a381273d1ea6a16db5ec3 (patch)
tree7cb16c2c460931bbf4798a79167770dfb48ff643 /ext/standard/var_unserializer.re
parent6c22f90b4a3d24a8da83e78f8eef97cba6c05197 (diff)
downloadphp-git-php-4.3.0dev_zend2_alpha3.tar.gz
This commit was manufactured by cvs2svn to create tagphp-4.3.0dev_zend2_alpha3
'php_4_3_0_dev_zend2_alpha3'.
Diffstat (limited to 'ext/standard/var_unserializer.re')
-rw-r--r--ext/standard/var_unserializer.re12
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 457c5bf83d..185909492b 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -375,12 +375,20 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
zend_error(E_WARNING, "'unserialize_callback_func' (%s) hasn't defined the class it was called for", user_func->value.str.val);
incomplete_class = 1;
ce = PHP_IC_ENTRY;
- } else
+ } else {
+#ifdef ZEND_ENGINE_2
+ ce = *(zend_class_entry **)ce; /* Bad hack, TBF! */
+#endif
efree(class_name);
+ }
}
}
- } else
+ } else {
+#ifdef ZEND_ENGINE_2
+ ce = *(zend_class_entry **)ce; /* Bad hack, TBF! */
+#endif
efree(class_name);
+ }
*p = YYCURSOR;
elements = object_common1(UNSERIALIZE_PASSTHRU, ce);