Fix for bug#46614 Extended MySQLi class gives incorrect empty() result

2 files changed, 37 insertions, 3 deletions

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index da126faba5..3a13583b65 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -337,7 +337,6 @@ zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
 	zval *retval;
 	mysqli_object *obj;
 	mysqli_prop_handler *hnd;
-	zend_object_handlers *std_hnd;
 	int ret;
 
 	ret = FAILURE;
@@ -363,7 +362,7 @@ zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
 			retval = EG(uninitialized_zval_ptr);
 		}
 	} else {
-		std_hnd = zend_get_std_object_handlers();
+		zend_object_handlers * std_hnd = zend_get_std_object_handlers();
 		retval = std_hnd->read_property(object, member, type TSRMLS_CC);
 	}
 
@@ -403,7 +402,7 @@ void mysqli_write_property(zval *object, zval *member, zval *value TSRMLS_DC)
 			zval_ptr_dtor(&value);
 		}
 	} else {
-		std_hnd = zend_get_std_object_handlers();
+		zend_object_handlers * std_hnd = zend_get_std_object_handlers();
 		std_hnd->write_property(object, member, value TSRMLS_CC);
 	}
 
@@ -460,6 +459,9 @@ static int mysqli_object_has_property(zval *object, zval *member, int has_set_ex
 			default:
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for has_set_exists");	
 		}
+	} else {
+		zend_object_handlers * std_hnd = zend_get_std_object_handlers();
+		ret = std_hnd->has_property(object, member, has_set_exists TSRMLS_CC);
 	}
 	return ret;
 } /* }}} */
diff --git a/ext/mysqli/tests/bug46614.phpt b/ext/mysqli/tests/bug46614.phpt
new file mode 100644
index 0000000000..84248b1fbb
--- /dev/null
+++ b/ext/mysqli/tests/bug46614.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Bug #46614 (Extended MySQLi class gives incorrect empty() result)
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+if (!defined("MYSQLI_ASYNC")) {
+	die("skip mysqlnd only");
+}
+?>
+--FILE--
+<?php
+class MySQL_Ext extends mysqli{
+	protected $fooData = array();
+	
+	public function isEmpty()
+	{
+		$this->extData[] = 'Bar';
+		return empty($this->extData);
+	}
+}
+
+
+
+	include ("connect.inc");
+	$MySQL_Ext = new MySQL_Ext($host, $user, $passwd, $db);
+
+	$isEmpty = $MySQL_Ext->isEmpty();
+	var_dump($isEmpty);
+?>
+--EXPECT--
+bool(false)