Merge branch 'PHP-8.6'

* PHP-8.6:
  Fix GH-24372: Keep stmt->executed set across PDOStatement::execute()

Author: iliaal

ext/pdo/pdo_stmt.c

@@ -380,29 +380,6 @@ static bool really_register_bound_param(struct pdo_bound_param_data *param, pdo_
 }
 /* }}} */
 
-static bool pdo_stmt_do_next_rowset(pdo_stmt_t *stmt);
-
-static void pdo_stmt_invalidate_result(pdo_stmt_t *stmt)
-{
-	if (stmt->methods->cursor_closer) {
-		stmt->methods->cursor_closer(stmt);
-	} else {
-		do {
-			while (stmt->methods->fetcher(stmt, PDO_FETCH_ORI_NEXT, 0))
-				;
-			if (!stmt->methods->next_rowset) {
-				break;
-			}
-
-			if (!pdo_stmt_do_next_rowset(stmt)) {
-				break;
-			}
-		} while (1);
-	}
-
-	stmt->executed = 0;
-}
-
 /* {{{ Execute a prepared statement, optionally binding parameters */
 PHP_METHOD(PDOStatement, execute)
 {
@@ -419,9 +396,10 @@ PHP_METHOD(PDOStatement, execute)
 		RETURN_THROWS();
 	}
 
-	if (stmt->executed) {
-		pdo_stmt_invalidate_result(stmt);
+	if (stmt->executed && stmt->methods->cursor_closer) {
+		stmt->methods->cursor_closer(stmt);
 	}
+	stmt->execute_incomplete = 1;
 	PDO_STMT_CLEAR_ERR();
 
 	if (input_params) {
@@ -488,6 +466,7 @@ PHP_METHOD(PDOStatement, execute)
 		RETURN_FALSE;
 	}
 	if (stmt->methods->executer(stmt)) {
+		stmt->execute_incomplete = 0;
 		if (!stmt->executed) {
 			/* this is the first execute */
 
@@ -594,7 +573,7 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, int colno, enum pdo
 
 static bool do_fetch_common(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori, zend_long offset) /* {{{ */
 {
-	if (!stmt->executed) {
+	if (!stmt->executed || stmt->execute_incomplete) {
 		return false;
 	}
 

ext/pdo/php_pdo_driver.h

@@ -574,7 +574,8 @@ struct _pdo_stmt_t {
 	 * emulate prepare and bind on its behalf */
 	uint16_t supports_placeholders:2;
 	uint16_t in_param_event:1;
-	uint16_t reserved: 11;
+	uint16_t execute_incomplete:1;
+	uint16_t reserved: 10;
 
 	/* keep track of bound input parameters.  Some drivers support
 	 * input/output parameters, but you can't rely on that working */