21 lines
878 B
Diff
21 lines
878 B
Diff
|
diff -up php-5.6.0RC1/ext/standard/var_unserializer.c.mock php-5.6.0RC1/ext/standard/var_unserializer.c
|
||
|
|
--- php-5.6.0RC1/ext/standard/var_unserializer.c.mock 2014-06-19 03:26:09.000000000 +0200
|
||
|
|
+++ php-5.6.0RC1/ext/standard/var_unserializer.c 2014-06-23 18:51:04.702265786 +0200
|
||
|
|
@@ -22,6 +22,7 @@
|
||
|
|
#include "php.h"
|
||
|
|
#include "ext/standard/php_var.h"
|
||
|
|
#include "php_incomplete_class.h"
|
||
|
|
+#include "Zend/zend_interfaces.h"
|
||
|
|
|
||
|
|
/* {{{ reference-handling for unserializer: var_* */
|
||
|
|
#define VAR_ENTRIES_MAX 1024
|
||
|
|
@@ -394,7 +395,7 @@ static inline long object_common1(UNSERI
|
||
|
|
|
||
|
|
(*p) += 2;
|
||
|
|
|
||
|
|
- if (ce->serialize == NULL) {
|
||
|
|
+ if (ce->serialize == NULL || ce->unserialize == zend_user_unserialize || ZEND_INTERNAL_CLASS != ce->type) {
|
||
|
|
object_init_ex(*rval, ce);
|
||
|
|
} else {
|
||
|
|
/* If this class implements Serializable, it should not land here but in object_custom(). The passed string
|