diff options
| author | Zeev Suraski <zeev@php.net> | 1999-07-23 16:02:51 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-07-23 16:02:51 +0000 |
| commit | 84aa8cce64c1c074a059fc74eb546cb028c32b5e (patch) | |
| tree | 32ddbad2f32e801f56c4c2247a7b905833338606 | |
| parent | 33f30aee64d01e7b3f59ef087b2b250a7eb3a1e5 (diff) | |
| download | php-git-84aa8cce64c1c074a059fc74eb546cb028c32b5e.tar.gz | |
* Add an API macro users can use to ensure an array member can be modifed
before they modify it.
* Fix a bug and remove redundant code in convert_to_long() (booleans and
resources weren't changing their types
| -rw-r--r-- | Zend/zend.h | 17 | ||||
| -rw-r--r-- | Zend/zend_operators.c | 7 |
2 files changed, 17 insertions, 7 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 32bf64976c..0274c212dd 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -241,8 +241,23 @@ extern zend_utility_values zend_uv; (z)->EA.is_ref = 0; \ (z)->EA.locks = 0; -#define MAKE_STD_ZVAL(zv) \ +#define MAKE_STD_ZVAL(zv) \ zv = (zval *) emalloc(sizeof(zval)); \ INIT_PZVAL(zv); +#define SEPARATE_ZVAL(ppzv) \ + { \ + zval *orig_ptr = *(ppzv); \ + \ + if (orig_ptr->refcount>1) { \ + orig_ptr->refcount--; \ + *(ppzv) = (zval *) emalloc(sizeof(zval)); \ + **(ppzv) = *orig_ptr; \ + zval_copy_ctor(*(ppzv)); \ + (*(ppzv))->refcount=1; \ + (*(ppzv))->EA.is_ref = 0; \ + (*(ppzv))->EA.locks = 0; \ + } \ + } + #endif /* _ZEND_H */ diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index d73feecd83..a8bd01892e 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -162,34 +162,29 @@ ZEND_API void convert_to_long_base(zval *op, int base) case IS_BOOL: case IS_RESOURCE: case IS_LONG: - return; + break; case IS_DOUBLE: op->value.lval = (long) op->value.dval; - op->type = IS_LONG; break; case IS_STRING: strval = op->value.str.val; op->value.lval = strtol(strval, NULL, base); - op->type = IS_LONG; STR_FREE(strval); break; case IS_ARRAY: tmp = (zend_hash_num_elements(op->value.ht)?1:0); zval_dtor(op); op->value.lval = tmp; - op->type = IS_LONG; break; case IS_OBJECT: tmp = (zend_hash_num_elements(op->value.obj.properties)?1:0); zval_dtor(op); op->value.lval = tmp; - op->type = IS_LONG; break; default: zend_error(E_WARNING, "Cannot convert to ordinal value"); zval_dtor(op); op->value.lval = 0; - op->type = IS_LONG; break; } |