From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 28 Feb 2014 09:04:46 +0000 (+0400)
Subject: Fixed isset($str[$double])
X-Git-Tag: POST_PHPNG_MERGE~412^2~487^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17a009ddce6c64a2952be4cc4a462964bc37e3e4;p=php

Fixed isset($str[$double])
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 1279f2382c..dc362369e6 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4667,7 +4667,7 @@ ZEND_VM_C_LABEL(num_index_prop):
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f209c1244a..7073a1f6f6 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -15841,7 +15841,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -17859,7 +17859,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -20271,7 +20271,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -23463,7 +23463,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -24909,7 +24909,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -26187,7 +26187,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -27465,7 +27465,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -29143,7 +29143,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -32571,7 +32571,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -34464,7 +34464,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -36751,7 +36751,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);
@@ -39687,7 +39687,7 @@ num_index_prop:
 		zval tmp;
 
 		if (Z_TYPE_P(offset) != IS_LONG) {
-			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
+			if (!Z_REFCOUNTED_P(offset) /* simple scalar types */
 					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 				ZVAL_DUP(&tmp, offset);