From: Andi Gutmans <andi@php.net>
Date: Mon, 13 Aug 2001 18:33:41 +0000 (+0000)
Subject: - MFZE1
X-Git-Tag: php-4.0.7RC1~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33539126d0511b4178443724a68de43dc8d228a4;p=php

- MFZE1
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index bec5e05fd1..51410c6e12 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2384,23 +2384,31 @@ send_by_ref:
 				NEXT_OPCODE();
 			case ZEND_ISSET_ISEMPTY: {
 					zval **var = get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_IS);
+					zval *value;
 					int isset;
 
 					if (!var) {
-						if (Ts[opline->op1.u.var].EA.type==IS_STRING_OFFSET) {
-							if (Ts[opline->op1.u.var].EA.data.str_offset.offset>=0
-								&& Ts[opline->op1.u.var].EA.data.str_offset.offset<Ts[opline->op1.u.var].EA.data.str_offset.str->value.str.len) {
-								isset = 1;
+						if (Ts[opline->op1.u.var].EA.type == IS_STRING_OFFSET) {
+							PZVAL_LOCK(Ts[opline->op1.u.var].EA.data.str_offset.str);
+							value = get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_IS);
+							if (value->value.str.val == empty_string) {
+								isset = 0;
 							} else {
+								isset = 1;
+							}
+						} else { /* IS_OVERLOADED_OBJECT */
+							value = get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_IS);
+							if (value->type == IS_NULL) {
 								isset = 0;
+							} else {
+								isset = 1;
 							}
-						} else {
-							isset = 1;
 						}
-					} else if (*var==EG(uninitialized_zval_ptr)
-						|| ((*var)->type == IS_NULL)) {
+					} else if (*var==EG(uninitialized_zval_ptr) || ((*var)->type == IS_NULL)) {
+						value = *var;
 						isset = 0;
 					} else {
+						value = *var;
 						isset = 1;
 					}
 
@@ -2409,14 +2417,7 @@ send_by_ref:
 							Ts[opline->result.u.var].tmp_var.value.lval = isset;
 							break;
 						case ZEND_ISEMPTY:
-							if (!var) {
-								if (!isset
-									|| Ts[opline->op1.u.var].EA.data.str_offset.str->value.str.val[Ts[opline->op1.u.var].EA.data.str_offset.offset]=='0') {
-									Ts[opline->result.u.var].tmp_var.value.lval = 1;
-								} else {
-									Ts[opline->result.u.var].tmp_var.value.lval = 0;
-								}
-							} else if (!isset || !zend_is_true((*var))) {
+							if (!isset || !zend_is_true(value)) {
 								Ts[opline->result.u.var].tmp_var.value.lval = 1;
 							} else {
 								Ts[opline->result.u.var].tmp_var.value.lval = 0;
@@ -2424,6 +2425,9 @@ send_by_ref:
 							break;
 					}
 					Ts[opline->result.u.var].tmp_var.type = IS_BOOL;
+					if (!var) {
+						FREE_OP(&opline->op1, EG(free_op1));
+					}
 				}
 				NEXT_OPCODE();
 			case ZEND_EXIT: