Move assertion after out_sqlda check

mlazdans · mlazdans · commit dc5ecaed806a · 2025-10-28T16:37:22.000+02:00
diff --git a/ibase_query.c b/ibase_query.c
@@ -1529,12 +1529,12 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
 		RETURN_FALSE;
 	}
 
-	assert(ib_query->out_fields_count > 0);
-
 	if (ib_query->out_sqlda == NULL || !ib_query->has_more_rows || !ib_query->is_open) {
 		RETURN_FALSE;
 	}
 
+	assert(ib_query->out_fields_count > 0);
+
 	if (ib_query->statement_type != isc_info_sql_stmt_exec_procedure) {
 		if (isc_dsql_fetch(IB_STATUS, &ib_query->stmt, 1, ib_query->out_sqlda)) {
 			ib_query->has_more_rows = 0;

Original file line number	Diff line number	Diff line change
`@@ -1529,12 +1529,12 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)`
`1529`	`1529`	`RETURN_FALSE;`
`1530`	`1530`	`}`
`1531`	`1531`
`1532`		`- assert(ib_query->out_fields_count > 0);`
`1533`		`-`
`1534`	`1532`	`if (ib_query->out_sqlda == NULL \|\| !ib_query->has_more_rows \|\| !ib_query->is_open) {`
`1535`	`1533`	`RETURN_FALSE;`
`1536`	`1534`	`}`
`1537`	`1535`
	`1536`	`+ assert(ib_query->out_fields_count > 0);`
	`1537`	`+`
`1538`	`1538`	`if (ib_query->statement_type != isc_info_sql_stmt_exec_procedure) {`
`1539`	`1539`	`if (isc_dsql_fetch(IB_STATUS, &ib_query->stmt, 1, ib_query->out_sqlda)) {`
`1540`	`1540`	`ib_query->has_more_rows = 0;`