From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 16 Jan 2003 00:44:17 +0000 (+0000)
Subject: Fixed bug #20933 (isset/empty didn't work when used on string offsets).
X-Git-Tag: PHP_5_0_dev_before_13561_fix~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12d2b01a25bbaaf4f47e74dd048d4b8b8e347255;p=php

Fixed bug #20933 (isset/empty didn't work when used on string offsets).
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index ea4e9114fc..8c46ce4bc7 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -3660,13 +3660,22 @@ int zend_isset_isempty_dim_obj_handler(ZEND_OPCODE_HANDLER_ARGS)
 					}
 					break;
 			}
-		} else {
-			if ((*container)->type == IS_OBJECT) {
-				result = Z_OBJ_HT_P(*container)->has_property(*container, offset, (EX(opline)->extended_value == ZEND_ISEMPTY) TSRMLS_CC);
+		} else if ((*container)->type == IS_OBJECT) {
+			result = Z_OBJ_HT_P(*container)->has_property(*container, offset, (EX(opline)->extended_value == ZEND_ISEMPTY) TSRMLS_CC);
+		} else if ((*container)->type == IS_STRING) { /* string offsets */
+			switch (EX(opline)->extended_value) {
+				case ZEND_ISSET:
+					if (offset->value.lval <= Z_STRLEN_PP(container)) {
+						result = 1;
+					}
+					break;
+				case ZEND_ISEMPTY:
+					if (offset->value.lval <= Z_STRLEN_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') {
+						result = 1;
+					}
+					break;
 			}
 		}
-	} else {
-		/* string offsets */
 	}
 	
 	EX_T(EX(opline)->result.u.var).tmp_var.type = IS_BOOL;