archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed pdo_firebird_handle_factory to check ret when starting a transaction (#17632)

Browse source 
Changed to not execute php_firebird_begin_transaction
if transaction cannot be started successfully

Closes #17632
This commit is contained in:
Saki Takamachi 2025-03-15 08:50:55 +09:00
parent 6717947ffe
commit e96a35b9a8
No known key found for this signature in database
GPG key ID: 770426E17EBBB3DD
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/pdo_firebird/firebird_driver.c
View file

@ -684,7 +684,7 @@ static bool firebird_handle_preparer(pdo_dbh_t *dbh, zend_string *sql, /* {{{ */
/* make all parameters nullable */ /* make all parameters nullable */
unsigned int i; unsigned int i;
XSQLVAR* var; XSQLVAR* var;
for (i = 0, var = S->in_sqlda->sqlvar; i < S->in_sqlda->sqld; i++, var++) { for (i = 0, var = S->in_sqlda->sqlvar; i < S->in_sqlda->sqld; i++, var++) {
/* The low bit of sqltype indicates that the parameter can take a NULL value */ /* The low bit of sqltype indicates that the parameter can take a NULL value */
var->sqltype |= 1; var->sqltype |= 1;
@ -1431,7 +1431,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /*
"HY000", H->isc_status[1], errmsg); "HY000", H->isc_status[1], errmsg);
} }
if (dbh->auto_commit && !H->tr) { if (ret && dbh->auto_commit && !H->tr) {
ret = php_firebird_begin_transaction(dbh, /* auto commit mode */ true); ret = php_firebird_begin_transaction(dbh, /* auto commit mode */ true);
} }