Merge branch 'PHP-8.5'

iliaal · iliaal · commit c0872ea33c4f · 2026-06-30T07:37:40.000-04:00
* PHP-8.5: Fix phpGH-20726: crash in pdo_odbc with pooling and no credentials (php#22512)
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
@@ -603,7 +603,11 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{
 				dsnbuf, sizeof(dsnbuf)-1, &dsnbuflen, SQL_DRIVER_NOPROMPT);
 	}
 	if (!use_direct) {
-		rc = SQLConnect(H->dbc, (SQLCHAR *) dbh->data_source, SQL_NTS, (SQLCHAR *) dbh->username, SQL_NTS, (SQLCHAR *) dbh->password, SQL_NTS);
+		/* unixODBC pooling strcmp()s the credentials when matching a cached
+		 * connection and crashes on a NULL username/password, so pass "". */
+		rc = SQLConnect(H->dbc, (SQLCHAR *) dbh->data_source, SQL_NTS,
+			(SQLCHAR *) (dbh->username ? dbh->username : ""), SQL_NTS,
+			(SQLCHAR *) (dbh->password ? dbh->password : ""), SQL_NTS);
 	}
 
 	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {

Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,11 @@ static int pdo_odbc_handle_factory(pdo_dbh_t dbh, zval driver_options) /* {{{`
`603`	`603`	`dsnbuf, sizeof(dsnbuf)-1, &dsnbuflen, SQL_DRIVER_NOPROMPT);`
`604`	`604`	`}`
`605`	`605`	`if (!use_direct) {`
`606`		`- rc = SQLConnect(H->dbc, (SQLCHAR ) dbh->data_source, SQL_NTS, (SQLCHAR ) dbh->username, SQL_NTS, (SQLCHAR *) dbh->password, SQL_NTS);`
	`606`	`+ /* unixODBC pooling strcmp()s the credentials when matching a cached`
	`607`	`+ * connection and crashes on a NULL username/password, so pass "". */`
	`608`	`+ rc = SQLConnect(H->dbc, (SQLCHAR *) dbh->data_source, SQL_NTS,`
	`609`	`+ (SQLCHAR *) (dbh->username ? dbh->username : ""), SQL_NTS,`
	`610`	`+ (SQLCHAR *) (dbh->password ? dbh->password : ""), SQL_NTS);`
`607`	`611`	`}`
`608`	`612`
`609`	`613`	`if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {`