Re: cvs: php-src /ext/standard incomplete_class.c php_incomplete_class.h
| From: | Marcus Boerger | Date: | Wed, 06 Jul 2005 07:21:35 +0000 |
| Subject: | Re: cvs: php-src /ext/standard incomplete_class.c php_incomplete_class.h | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-32708@lists.php.net to get a copy of this message | ||
Hello Jani,
which compiler is this? According to my knowledge size_t is the type that
can hold any allocatable size. Or can it be the problem is somewhere else?
marcus
Wednesday, July 6, 2005, 1:48:47 AM, you wrote:
> sniper Tue Jul 5 19:48:47 2005 EDT
> Modified files:
> /php-src/ext/standard incomplete_class.c php_incomplete_class.h
> Log:
> - Fixed crash in serialize() + classes. (64bit only)
>
> http://cvs.php.net/diff.php/php-src/ext/standard/incomplete_class.c?r1=1.26&r2=1.27&ty=u
> Index: php-src/ext/standard/incomplete_class.c
> diff -u php-src/ext/standard/incomplete_class.c:1.26
> php-src/ext/standard/incomplete_class.c:1.27
> --- php-src/ext/standard/incomplete_class.c:1.26 Sat Oct 30 15:14:05 2004
> +++ php-src/ext/standard/incomplete_class.c Tue Jul 5 19:48:44 2005
> @@ -17,7 +17,7 @@
> */
> -/* $Id: incomplete_class.c,v 1.26 2004/10/30 19:14:05 helly Exp $ */
> +/* $Id: incomplete_class.c,v 1.27 2005/07/05 23:48:44 sniper Exp $ */
> #include "php.h"
> #include "basic_functions.h"
> @@ -122,7 +122,7 @@
> /* {{{ 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 @@
> /* {{{ 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();
>
> http://cvs.php.net/diff.php/php-src/ext/standard/php_incomplete_class.h?r1=1.15&r2=1.16&ty=u
> Index: php-src/ext/standard/php_incomplete_class.h
> diff -u php-src/ext/standard/php_incomplete_class.h:1.15
> php-src/ext/standard/php_incomplete_class.h:1.16
> --- php-src/ext/standard/php_incomplete_class.h:1.15 Wed Jun 29 05:28:44 2005
> +++ php-src/ext/standard/php_incomplete_class.h Tue Jul 5 19:48:44 2005
> @@ -16,7 +16,7 @@
>
> +----------------------------------------------------------------------+
> */
> -/* $Id: php_incomplete_class.h,v 1.15 2005/06/29 09:28:44 johannes Exp $ */
> +/* $Id: php_incomplete_class.h,v 1.16 2005/07/05 23:48:44 sniper Exp $ */
> #ifndef PHP_INCOMPLETE_CLASS_H
> #define 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 @@
> 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
> };
--
Best regards,
Marcus mailto:mail@marcus-boerger.de