diff options
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/ChangeLog | 25 | ||||
| -rw-r--r-- | Zend/zend.h | 2 | ||||
| -rw-r--r-- | Zend/zend_constants.c | 2 | ||||
| -rw-r--r-- | Zend/zend_dynamic_array.h | 2 | ||||
| -rw-r--r-- | Zend/zend_object_handlers.c | 7 |
5 files changed, 3 insertions, 35 deletions
diff --git a/Zend/ChangeLog b/Zend/ChangeLog index aad5fccf8e..27619d1328 100644 --- a/Zend/ChangeLog +++ b/Zend/ChangeLog @@ -1,28 +1,3 @@ -2004-07-14 Stanislav Malyshev <stas@zend.com> - - * zend_object_handlers.c: - be consistent with write_dimension - - * zend_object_handlers.c: - fix #28957 - -2004-07-13 Andi Gutmans <andi@zend.com> - - * zend.h: - - 5.0.1-dev - -2004-07-13 Marcus Boerger <marcus.boerger@post.rwth-aachen.de> - - * zend_constants.c: - Bugfix #29116 Zend constant warning uses memory after free (jdolecek at - NetBSD dot org) - -2004-07-13 Andi Gutmans <andi@zend.com> - - * (php_5_0_0) - zend.h: - - Roll PHP 5.0.0 - 2004-07-12 Ilia Alshanetsky <ilia@prohost.org> * (php_5_0_0RC4) diff --git a/Zend/zend.h b/Zend/zend.h index c9b58779b5..3bee7b576b 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -22,7 +22,7 @@ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.0.1-dev" +#define ZEND_VERSION "2.0.0" #define ZEND_ENGINE_2 diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 0b913edbe5..dfcc1ae562 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -317,11 +317,11 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC) } if (zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) { - zend_error(E_NOTICE,"Constant %s already defined", name); free(c->name); if (!(c->flags & CONST_PERSISTENT)) { zval_dtor(&c->value); } + zend_error(E_NOTICE,"Constant %s already defined", name); ret = FAILURE; } if (lowercase_name) { diff --git a/Zend/zend_dynamic_array.h b/Zend/zend_dynamic_array.h index 2d26b30ef1..8aaa801c8d 100644 --- a/Zend/zend_dynamic_array.h +++ b/Zend/zend_dynamic_array.h @@ -30,7 +30,7 @@ typedef struct _dynamic_array { } dynamic_array; BEGIN_EXTERN_C() -ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_size, unsigned int size); +ZEND_API int zend_dynamic_array_init(dynamic_array *da); ZEND_API void *zend_dynamic_array_push(dynamic_array *da); ZEND_API void *zend_dynamic_array_pop(dynamic_array *da); ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index); diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 7965bb0eb3..d7f57a8d96 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -381,14 +381,7 @@ zval *zend_std_read_dimension(zval *object, zval *offset, int type TSRMLS_DC) zval *retval; if (instanceof_function_ex(ce, zend_ce_arrayaccess, 1 TSRMLS_CC)) { - if(offset == NULL) { - /* [] construct */ - zval offset_null; - INIT_ZVAL(offset_null); - offset = &offset_null; - } zend_call_method_with_1_params(&object, ce, NULL, "offsetget", &retval, offset); - if (!retval) { if (!EG(exception)) { zend_error(E_ERROR, "Undefined offset for object of type %s used as array", ce->name); |