Fix GH-16131: Prevent mixing PDO sub-classes with different DSN

Author: kocsismate

ext/pdo/pdo_dbh.c

@@ -237,45 +237,64 @@ static bool create_driver_specific_pdo_object(pdo_driver_t *driver, zend_class_e
 		if (ce_based_on_driver_name) {
 			if (instanceof_function(ce_based_on_called_object, ce_based_on_driver_name) == false) {
 				zend_throw_exception_ex(pdo_exception_ce, 0,
-					"%s::connect() cannot be called when connecting to the \"%s\" driver, "
-					"either %s::connect() or PDO::connect() must be called instead",
-					ZSTR_VAL(called_scope->name), driver->driver_name, ZSTR_VAL(ce_based_on_driver_name->name));
+					"%s::%s() cannot be called when connecting to the \"%s\" driver, "
+					"either call %s::%s() or PDO::%s() instead",
+					ZSTR_VAL(called_scope->name),
+					new_object ? "connect" : "__construct",
+					driver->driver_name,
+					ZSTR_VAL(ce_based_on_driver_name->name),
+					new_object ? "connect" : "__construct",
+					new_object ? "connect" : "__construct"
+				);
 				return false;
 			}
 
-			/* A driver-specific implementation was instantiated via the connect() method of the appropriate driver class */
-			object_init_ex(new_object, ce_based_on_called_object);
+			/* A driver-specific implementation is instantiated with the appropriate driver class */
+			if (new_object) {
+				object_init_ex(new_object, ce_based_on_called_object);
+			}
 			return true;
 		} else {
 			zend_throw_exception_ex(pdo_exception_ce, 0,
-				"%s::connect() cannot be called when connecting to an unknown driver, "
-				"PDO::connect() must be called instead",
-				ZSTR_VAL(called_scope->name));
+				"%s::%s() cannot be called when connecting to an unknown driver, "
+				"call PDO::%s() instead",
+				ZSTR_VAL(called_scope->name),
+				new_object ? "connect" : "__construct",
+				new_object ? "connect" : "__construct"
+			);
 			return false;
 		}
 	}
 
 	if (ce_based_on_driver_name) {
 		if (called_scope != pdo_dbh_ce) {
-			/* A driver-specific implementation was instantiated via the connect method of a wrong driver class */
+			/* A driver-specific implementation is instantiated of a wrong driver class */
 			zend_throw_exception_ex(pdo_exception_ce, 0,
-				"%s::connect() cannot be called when connecting to the \"%s\" driver, "
-				"either %s::connect() or PDO::connect() must be called instead",
-				ZSTR_VAL(called_scope->name), driver->driver_name, ZSTR_VAL(ce_based_on_driver_name->name));
+				"%s::%s() cannot be called when connecting to the \"%s\" driver, "
+				"either call %s::%s() or PDO::%s() instead",
+				ZSTR_VAL(called_scope->name),
+				new_object ? "connect" : "__construct",
+				driver->driver_name,
+				ZSTR_VAL(ce_based_on_driver_name->name),
+				new_object ? "connect" : "__construct",
+				new_object ? "connect" : "__construct"
+			);
 			return false;
 		}
 
 		/* A driver-specific implementation was instantiated via PDO::__construct() */
-		object_init_ex(new_object, ce_based_on_driver_name);
-	} else {
+		if (new_object) {
+			object_init_ex(new_object, ce_based_on_driver_name);
+		}
+	} else if (new_object) {
 		/* No driver-specific implementation found */
 		object_init_ex(new_object, called_scope);
 	}
 
 	return true;
 }
 
-static void internal_construct(INTERNAL_FUNCTION_PARAMETERS, zend_object *object, zend_class_entry *current_scope, zval *new_zval_object)
+PDO_API void internal_construct(INTERNAL_FUNCTION_PARAMETERS, zend_object *object, zend_class_entry *current_scope, zval *new_zval_object)
 {
 	pdo_dbh_t *dbh = NULL;
 	bool is_persistent = 0;
@@ -343,12 +362,13 @@ static void internal_construct(INTERNAL_FUNCTION_PARAMETERS, zend_object *object
 		RETURN_THROWS();
 	}
 
-	if (new_zval_object != NULL) {
-		ZEND_ASSERT((driver->driver_name != NULL) && "PDO driver name is null");
-		if (!create_driver_specific_pdo_object(driver, current_scope, new_zval_object)) {
-			RETURN_THROWS();
-		}
+	ZEND_ASSERT((driver->driver_name != NULL) && "PDO driver name is null");
+
+	if (!create_driver_specific_pdo_object(driver, current_scope, new_zval_object)) {
+		RETURN_THROWS();
+	}
 
+	if (new_zval_object) {
 		dbh = Z_PDO_DBH_P(new_zval_object);
 	} else {
 		dbh = php_pdo_dbh_fetch_inner(object);
@@ -497,7 +517,7 @@ static void internal_construct(INTERNAL_FUNCTION_PARAMETERS, zend_object *object
 /* {{{ */
 PHP_METHOD(PDO, __construct)
 {
-	internal_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, Z_OBJ(EX(This)), EX(This).value.ce, NULL);
+	internal_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, Z_OBJ(EX(This)), execute_data->func->common.scope, NULL);
 }
 /* }}} */
 

ext/pdo/php_pdo_driver.h

@@ -694,6 +694,8 @@ PDO_API void php_pdo_dbh_delref(pdo_dbh_t *dbh);
 PDO_API void php_pdo_free_statement(pdo_stmt_t *stmt);
 PDO_API void php_pdo_stmt_set_column_count(pdo_stmt_t *stmt, int new_count);
 
+PDO_API void internal_construct(INTERNAL_FUNCTION_PARAMETERS, zend_object *object, zend_class_entry *current_scope, zval *new_zval_object);
+
 /* Normalization for fetching long param for driver attributes */
 PDO_API bool pdo_get_long_param(zend_long *lval, zval *value);
 PDO_API bool pdo_get_bool_param(bool *bval, zval *value);

ext/pdo_dblib/pdo_dblib.c

@@ -27,6 +27,7 @@
 #include "php_pdo_dblib.h"
 #include "php_pdo_dblib_int.h"
 #include "zend_exceptions.h"
+#include "zend_attributes.h"
 #include "pdo_dblib_arginfo.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(dblib)
@@ -241,3 +242,8 @@ PHP_MINFO_FUNCTION(pdo_dblib)
 	php_info_print_table_row(2, "Flavour", PDO_DBLIB_FLAVOUR);
 	php_info_print_table_end();
 }
+
+PHP_METHOD(PdoDblib_ce, __construct)
+{
+	internal_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, Z_OBJ(EX(This)), execute_data->func->common.scope, NULL);
+}

ext/pdo_dblib/pdo_dblib.stub.php

@@ -30,4 +30,6 @@ class Dblib extends \PDO
 
     /** @cvalue PDO_DBLIB_ATTR_DATETIME_CONVERT */
     public const int ATTR_DATETIME_CONVERT = UNKNOWN;
+
+    public function __construct(string $dsn, ?string $username = null, #[\SensitiveParameter] ?string $password = null, ?array $options = null) {}
 }

ext/pdo_dblib/pdo_dblib_arginfo.h

@@ -25,6 +25,7 @@
 #include "ext/pdo/php_pdo_driver.h"
 #include "php_pdo_firebird.h"
 #include "php_pdo_firebird_int.h"
+#include "zend_attributes.h"
 #include "pdo_firebird_arginfo.h"
 
 static zend_class_entry *PdoFirebird_ce;
@@ -101,6 +102,11 @@ PHP_MINFO_FUNCTION(pdo_firebird) /* {{{ */
 }
 /* }}} */
 
+PHP_METHOD(Pdo_Firebird, __construct)
+{
+	internal_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, Z_OBJ(EX(This)), execute_data->func->common.scope, NULL);
+}
+
 PHP_METHOD(Pdo_Firebird, getApiVersion)
 {
 	if (zend_parse_parameters_none() == FAILURE) {

ext/pdo_firebird/pdo_firebird.c

@@ -34,5 +34,7 @@ class Firebird extends \PDO
     /** @cvalue PDO_FB_WRITABLE_TRANSACTION */
     public const int WRITABLE_TRANSACTION = UNKNOWN;
 
+    public function __construct(string $dsn, ?string $username = null, #[\SensitiveParameter] ?string $password = null, ?array $options = null) {}
+
     public static function getApiVersion(): int {}
 }

ext/pdo_firebird/pdo_firebird.stub.php

@@ -26,6 +26,7 @@
 #include "ext/pdo/php_pdo_driver.h"
 #include "php_pdo_mysql.h"
 #include "php_pdo_mysql_int.h"
+#include "zend_attributes.h"
 #include "pdo_mysql_arginfo.h"
 
 static zend_class_entry *pdo_mysql_ce;
@@ -84,6 +85,11 @@ static const MYSQLND_REVERSE_API pdo_mysql_reverse_api = {
 };
 #endif
 
+PHP_METHOD(Pdo_Mysql, __construct)
+{
+	internal_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, Z_OBJ(EX(This)), execute_data->func->common.scope, NULL);
+}
+
 /* Returns the number of SQL warnings during the execution of the last statement */
 PHP_METHOD(Pdo_Mysql, getWarningCount)
 {

ext/pdo_firebird/pdo_firebird_arginfo.h

@@ -73,5 +73,7 @@ class Mysql extends \PDO
     public const int ATTR_LOCAL_INFILE_DIRECTORY = UNKNOWN;
 #endif
 
+    public function __construct(string $dsn, ?string $username = null, #[\SensitiveParameter] ?string $password = null, ?array $options = null) {}
+
     public function getWarningCount(): int {}
 }