- MFH Fix Bug #40872 (inconsistency in offsetSet, offsetExists treatment

  of string enclosed integers)

2 files changed, 32 insertions, 4 deletions

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 419eb52e38..fec74f57f9 100755
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -456,7 +456,7 @@ static int spl_array_has_dimension_ex(int check_inherited, zval *object, zval *o
 {
 	spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
 	long index;
-	zval *rv;
+	zval *rv, **tmp;
 
 	if (check_inherited && intern->fptr_offset_has) {
 		SEPARATE_ARG_IF_REF(offset);
@@ -475,9 +475,7 @@ static int spl_array_has_dimension_ex(int check_inherited, zval *object, zval *o
 	switch(Z_TYPE_P(offset)) {
 	case IS_STRING:
 		if (check_empty) {
-			zval **tmp;
-			HashTable *ht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
-			if (zend_hash_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **) &tmp) != FAILURE && zend_is_true(*tmp)) {
+			if (zend_symtable_find(spl_array_get_hash_table(intern, 0 TSRMLS_CC), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **) &tmp) != FAILURE && zend_is_true(*tmp)) {
 				return 1;
 			}
 			return 0;
diff --git a/ext/spl/tests/bug40872.phpt b/ext/spl/tests/bug40872.phpt
new file mode 100755
index 0000000000..a48fe74feb
--- /dev/null
+++ b/ext/spl/tests/bug40872.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #40872 (inconsistency in offsetSet, offsetExists treatment of string enclosed integers)
+--FILE--
+<?php
+	class Project {
+		public $id;
+
+		function __construct($id) {
+			$this->id = $id;
+		}
+	}
+
+	class ProjectsList extends ArrayIterator {
+		public function add(Project $item) {
+			$this->offsetSet($item->id, $item);
+		}
+	}
+
+	$projects = new ProjectsList();
+	$projects->add(new Project('1'));
+	$projects->add(new Project(2));
+
+	var_dump($projects->offsetExists(1));
+	var_dump($projects->offsetExists('2'));
+?>
+===DONE===
+--EXPECT--
+bool(true)
+bool(true)
+===DONE===