MFH: fix #35293 (PDO segfaults when using persistent connections)

diff --git a/NEWS b/NEWS
index 8d4e021e8ceda7532274e445383cda992f8139b0..c4aaaf51141bc1072e9ecf809eb4658ab9615826 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Nov 2005, PHP 5.1
+- FIxed bug #35293 (PDO segfaults when using persistent connections). (Tony)
 - Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
 - Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
 - Fixed bug #33153 (crash in mssql_next result). (Frank)

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 8acf8eb010ed88bd5bcc68a2e1745c02798deafc..12d04898770c5f0c9aa352dd40115397fadace92 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -341,6 +341,8 @@ static PHP_METHOD(PDO, dbh_constructor)
                if (pdbh) {
                        /* let's copy the emalloc bits over from the other handle */
                        pdbh->ce = dbh->ce;
+                       pdbh->def_stmt_ce = dbh->def_stmt_ce;
+                       pdbh->def_stmt_ctor_args = dbh->def_stmt_ctor_args;
                        pdbh->properties = dbh->properties;
                        /* kill the non-persistent thingamy */
                        efree(dbh);