cvs: php4 /ext/standard var_unserializer.re
| From: | Stanislav Malyshev | Date: | Sun, 18 Aug 2002 12:22:28 +0000 |
| Subject: | cvs: php4 /ext/standard var_unserializer.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13454@lists.php.net to get a copy of this message | ||
stas Sun Aug 18 08:22:28 2002 EDT
Modified files:
/php4/ext/standard var_unserializer.re
Log:
ZE2 compatibility fix
## In ZE2 the hash contains zend_class_entry *!
Index: php4/ext/standard/var_unserializer.re
diff -u php4/ext/standard/var_unserializer.re:1.9 php4/ext/standard/var_unserializer.re:1.10
--- php4/ext/standard/var_unserializer.re:1.9 Sun Aug 4 19:45:38 2002
+++ php4/ext/standard/var_unserializer.re Sun Aug 18 08:22:28 2002
@@ -375,12 +375,20 @@
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);