Merge branch 'PHP-8.4'

NattyNarwhal · NattyNarwhal · commit a7df6a7759c9 · 2025-01-27T13:43:54.000-04:00
* PHP-8.4: Fix crash in PDO_ODBC statement dtor (#17586)
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
@@ -136,7 +136,11 @@ static int odbc_stmt_dtor(pdo_stmt_t *stmt)
 {
 	pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
 
-	if (S->stmt != SQL_NULL_HANDLE) {
+	// TODO: Factor this out; pg/mysql/firebird do the same thing
+	bool server_obj_usable = !Z_ISUNDEF(stmt->database_object_handle)
+		&& IS_OBJ_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE(stmt->database_object_handle)])
+		&& !(OBJ_FLAGS(Z_OBJ(stmt->database_object_handle)) & IS_OBJ_FREE_CALLED);
+	if (S->stmt != SQL_NULL_HANDLE && server_obj_usable) {
 		if (stmt->executed) {
 			SQLCloseCursor(S->stmt);
 		}

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,11 @@ static int odbc_stmt_dtor(pdo_stmt_t *stmt)`
`136`	`136`	`{`
`137`	`137`	`pdo_odbc_stmt S = (pdo_odbc_stmt)stmt->driver_data;`
`138`	`138`
`139`		`- if (S->stmt != SQL_NULL_HANDLE) {`
	`139`	`+ // TODO: Factor this out; pg/mysql/firebird do the same thing`
	`140`	`+ bool server_obj_usable = !Z_ISUNDEF(stmt->database_object_handle)`
	`141`	`+ && IS_OBJ_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE(stmt->database_object_handle)])`
	`142`	`+ && !(OBJ_FLAGS(Z_OBJ(stmt->database_object_handle)) & IS_OBJ_FREE_CALLED);`
	`143`	`+ if (S->stmt != SQL_NULL_HANDLE && server_obj_usable) {`
`140`	`144`	`if (stmt->executed) {`
`141`	`145`	`SQLCloseCursor(S->stmt);`
`142`	`146`	`}`