- Fixed crash in serialize() + classes. (64bit only)

diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c
index 00666edba9f4d659771c239232e158ee859357c1..7485d34a726d4ee71353ca64cfc81cf70c52e8a5 100644 (file)
--- a/ext/standard/incomplete_class.c
+++ b/ext/standard/incomplete_class.c
@@ -122,7 +122,7 @@ zend_class_entry *php_create_incomplete_class(TSRMLS_D)
 
 /* {{{ php_lookup_class_name
  */
-char *php_lookup_class_name(zval *object, size_t *nlen)
+char *php_lookup_class_name(zval *object, zend_uint *nlen)
 {
        zval **val;
        char *retval = NULL;
@@ -144,7 +144,7 @@ char *php_lookup_class_name(zval *object, size_t *nlen)
 
 /* {{{ php_store_class_name
  */
-void php_store_class_name(zval *object, const char *name, size_t len)
+void php_store_class_name(zval *object, const char *name, zend_uint len)
 {
        zval *val;
        TSRMLS_FETCH();

diff --git a/ext/standard/php_incomplete_class.h b/ext/standard/php_incomplete_class.h
index 408a04b6a7e1b9dede0a68b1e06109e8983b12a9..31751d7df3656ae7700144be2db0301ba636c268 100644 (file)
--- a/ext/standard/php_incomplete_class.h
+++ b/ext/standard/php_incomplete_class.h
@@ -42,7 +42,7 @@
 
 #define PHP_CLASS_ATTRIBUTES                                                                                   \
        char *class_name;                                                                                                       \
-       size_t name_len;                                                                                                        \
+       zend_uint name_len;                                                                                                     \
        zend_bool free_class_name = 0;                                                                          \
        zend_bool incomplete_class = 0
 
@@ -55,8 +55,8 @@ extern "C" {
        
 zend_class_entry *php_create_incomplete_class(TSRMLS_D);
 
-char *php_lookup_class_name(zval *object, size_t *nlen);
-void  php_store_class_name(zval *object, const char *name, size_t len);
+char *php_lookup_class_name(zval *object, zend_uint *nlen);
+void  php_store_class_name(zval *object, const char *name, zend_uint len);
 
 #ifdef __cplusplus
 };