diff options
| author | Andi Gutmans <andi@php.net> | 1999-10-22 22:35:16 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-10-22 22:35:16 +0000 |
| commit | 9b83d1ca5d4903ec6a920700640b15f1d631f7e3 (patch) | |
| tree | 538a1ec3af8d7668883b748386883e54f81c9478 | |
| parent | 23882d31c4bbca2e545c9895fb4d1d1268fd957d (diff) | |
| download | php-git-9b83d1ca5d4903ec6a920700640b15f1d631f7e3.tar.gz | |
- Fix isset() with string offsets.
| -rw-r--r-- | Zend/zend_execute.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 129083f1c9..4850126dc4 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2018,7 +2018,7 @@ send_by_ref: } break; case ZEND_ISSET_ISEMPTY: { - zval *var = get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_IS); + zval **var = get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_IS); int isset; if (!var) { @@ -2032,8 +2032,8 @@ send_by_ref: } else { isset = 1; } - } else if (var==EG(uninitialized_zval_ptr) - || (var->type == IS_STRING && var->value.str.val == undefined_variable_string)) { + } else if (*var==EG(uninitialized_zval_ptr) + || ((*var)->type == IS_STRING && (*var)->value.str.val == undefined_variable_string)) { isset = 0; } else { isset = 1; @@ -2051,7 +2051,7 @@ send_by_ref: } else { Ts[opline->result.u.var].tmp_var.value.lval = 0; } - } else if (!isset || !zend_is_true(var)) { + } else if (!isset || !zend_is_true((*var))) { Ts[opline->result.u.var].tmp_var.value.lval = 1; } else { Ts[opline->result.u.var].tmp_var.value.lval = 0; |