Skip to content

Commit 757d1fd

Browse files
committed
Fix smaller issues
1 parent dadc86f commit 757d1fd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ext/mysqli/mysqli_nonapi.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,9 @@ PHP_FUNCTION(mysqli_fetch_column)
447447
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &col_no) == FAILURE) {
448448
RETURN_THROWS();
449449
}
450-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
450+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES*, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
451451

452-
if(col_no < 0) {
452+
if (col_no < 0) {
453453
zend_argument_value_error(ERROR_ARG_POS(2), "must be greater than or equal to 0");
454454
RETURN_THROWS();
455455
}
@@ -460,12 +460,12 @@ PHP_FUNCTION(mysqli_fetch_column)
460460

461461
php_mysqli_fetch_into_hash_aux(&row_array, result, MYSQLI_NUM);
462462
if (Z_TYPE(row_array) != IS_ARRAY) {
463-
zval_ptr_dtor(&row_array);
463+
zval_ptr_dtor_nogc(&row_array);
464464
RETURN_FALSE;
465465
}
466466

467-
ZVAL_COPY(return_value, zend_hash_index_find(Z_ARR(row_array), col_no));
468-
zval_ptr_dtor(&row_array);
467+
ZVAL_COPY_VALUE(return_value, zend_hash_index_find(Z_ARR(row_array), col_no));
468+
zval_ptr_dtor_nogc(&row_array);
469469
}
470470
/* }}} */
471471

ext/mysqli/tests/mysqli_fetch_column.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
mysqli_fetch_assoc()
2+
mysqli_fetch_column()
33
--SKIPIF--
44
<?php
55
require_once 'skipif.inc';

0 commit comments

Comments
 (0)