Merge branch 'PHP-8.2' into PHP-8.3

ndossche · ndossche · commit 46924ac9fa83 · 2024-07-22T18:33:32.000+02:00
* PHP-8.2:
  Fix bogus fallthrough path in firebird_handle_get_attribute()
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -977,8 +977,7 @@ static int firebird_handle_get_attribute(pdo_dbh_t dbh, zend_long attr, zval v`
`977`	`977`	`ZVAL_STRING(val, tmp);`
`978`	`978`	`return 1;`
`979`	`979`	`}`
`980`		`- /* TODO Check this is correct? */`
`981`		`- ZEND_FALLTHROUGH;`
	`980`	`+ return -1;`
`982`	`981`
`983`	`982`	`case PDO_ATTR_FETCH_TABLE_NAMES:`
`984`	`983`	`ZVAL_BOOL(val, H->fetch_table_names);`