From b8e9c5ba6a8018de0bfa180e0b1576ecf6689a2f Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:32:16 +0200 Subject: [PATCH] Fix bogus fallthrough path in firebird_handle_get_attribute() If getting the version fails, we should return -1 according to php_pdo_driver.h:259, not fall through to another attribute. Closes GH-15066. --- NEWS | 3 +++ ext/pdo_firebird/firebird_driver.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index a1086fd4991..d497db6690d 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,9 @@ PHP NEWS . Fixed bug GH-13817 (Segmentation fault for enabled observers after pass 4). (Bob) +- PDO_Firebird: + . Fix bogus fallthrough path in firebird_handle_get_attribute(). (nielsdos) + - Soap: . Fixed bug #55639 (Digest autentication dont work). (nielsdos) diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index 7dc40f510d4..03c9f1b7741 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -977,8 +977,7 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v ZVAL_STRING(val, tmp); return 1; } - /* TODO Check this is correct? */ - ZEND_FALLTHROUGH; + return -1; case PDO_ATTR_FETCH_TABLE_NAMES: ZVAL_BOOL(val, H->fetch_table_names);