Fix code review

Author: kocsismate

ext/mysqli/mysqli.c

@@ -303,6 +303,10 @@ zval *mysqli_read_property(zend_object *object, zend_string *name, int type, voi
 
 	obj = php_mysqli_fetch_object(object);
 
+	if (type == BP_VAR_IS && !obj->ptr) {
+		return &EG(uninitialized_zval);
+	}
+
 	if (obj->prop_handler != NULL) {
 		hnd = zend_hash_find_ptr(obj->prop_handler, name);
 	}
@@ -404,6 +408,7 @@ HashTable *mysqli_object_get_debug_info(zend_object *object, int *is_temp)
 	ZEND_HASH_FOREACH_PTR(props, entry) {
 		zval rv;
 		zval *value;
+
 		value = mysqli_read_property(object, entry->name, BP_VAR_IS, 0, &rv);
 		if (value != &EG(uninitialized_zval)) {
 			zend_hash_add(retval, entry->name, value);

ext/mysqli/mysqli_nonapi.c

@@ -731,7 +731,7 @@ static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_ar
 	int i = 0, current = 0;
 
 	if (Z_TYPE_P(in_array) != IS_ARRAY) {
-		return 0;
+		return SUCCESS;
 	}
 	*out_array = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(in_array)) + 1, sizeof(MYSQLND *));
 	ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(in_array), elem) {
@@ -745,17 +745,17 @@ static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_ar
 			mysqli_object *intern = Z_MYSQLI_P(elem);
 			if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
 		  		zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));
-				return -1;
+				return FAILURE;
 		  	}
 			mysql = (MY_MYSQL*) my_res->ptr;
 			if (MYSQLI_STATUS_VALID && my_res->status < MYSQLI_STATUS_VALID) {
-				zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));
-				return -1;
+				zend_throw_error(NULL, "%s object is not fully initialized", ZSTR_VAL(intern->zo.ce->name));
+				return FAILURE;
 			}
 			(*out_array)[current++] = mysql->mysql;
 		}
 	} ZEND_HASH_FOREACH_END();
-	return 0;
+	return SUCCESS;
 }
 /* }}} */
 
@@ -859,13 +859,13 @@ PHP_FUNCTION(mysqli_poll)
 	}
 
 	if (r_array != NULL) {
-		if (mysqlnd_zval_array_to_mysqlnd_array(r_array, &new_r_array) == -1) {
+		if (mysqlnd_zval_array_to_mysqlnd_array(r_array, &new_r_array) == FAILURE) {
 			efree(new_r_array);
 			RETURN_THROWS();
 		}
 	}
 	if (e_array != NULL) {
-		if (mysqlnd_zval_array_to_mysqlnd_array(e_array, &new_e_array) == -1) {
+		if (mysqlnd_zval_array_to_mysqlnd_array(e_array, &new_e_array) == FAILURE) {
 			efree(new_e_array);
 			RETURN_THROWS();
 		}

ext/mysqli/tests/mysqli_real_connect.phpt

@@ -111,11 +111,7 @@ mysqli.allow_local_infile=1
 	}
 
 	mysqli_close($link);
-	try {
-        @var_dump($link);
-	} catch (Error $exception) {
-	    echo $exception->getMessage() . "\n";
-	}
+	var_dump($link);
 
 	if ($IS_MYSQLND) {
 		ini_set('mysqli.default_host', 'p:' . $host);
@@ -159,19 +155,6 @@ mysqli.allow_local_infile=1
 --EXPECTF--
 Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
 object(mysqli)#%d (%d) {
-  ["affected_rows"]=>
-  bool(false)
-  ["client_info"]=>
-  %s
-  ["client_version"]=>
-  int(%d)
-  ["connect_errno"]=>
-  int(%d)
-  ["connect_error"]=>
-  NULL
-  ["error_list"]=>
-  %s
 }
 mysqli object is already closed
-mysqli object is already closed
 done!

ext/mysqli/tests/mysqli_result_references.phpt

@@ -60,11 +60,7 @@ require_once('skipifconnectfailure.inc');
 	$references[$idx++] = &$res;
 	mysqli_free_result($res);
 
-	try {
-	    @debug_zval_dump($references);
-	} catch (Error $exception) {
-	    echo $exception->getMessage() . "\n";
-	}
+	debug_zval_dump($references);
 
 	if (!(mysqli_real_query($link, "SELECT id, label FROM test ORDER BY id ASC LIMIT 1")) ||
 			!($res = mysqli_use_result($link)))
@@ -134,14 +130,9 @@ array(7) refcount(2){
     &int(4)
   }
   [6]=>
-  &object(mysqli_result)#%d (2) refcount(%d){
-    ["lengths"]=>
-    bool(false)
-    ["type"]=>
-    bool(false)
+  &object(mysqli_result)#%d (0) refcount(%d){
   }
 }
-mysqli_result object is already closed
 array(1) refcount(2){
   [0]=>
   array(2) refcount(1){