iliaa Wed Sep 12 18:26:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pdo pdo_dbh.c
Log:
Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.946&r2=1.2027.2.547.2.947&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.946 php-src/NEWS:1.2027.2.547.2.947
--- php-src/NEWS:1.2027.2.547.2.946 Wed Sep 12 11:46:02 2007
+++ php-src/NEWS Wed Sep 12 18:26:48 2007
@@ -15,6 +15,7 @@
Reported by Laurent gaffie. (Ilia)
- Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre)
+- Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT). (Ilia)
- Fixed bug #42627 (bz2 extension fails to build with -fno-common).
(dolecek at netbsd dot org)
- Fixed Bug #42596 (session.save_path MODE option does not work). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.16&r2=1.82.2.31.2.17&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.16
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.16 Thu Aug 30 14:06:12 2007
+++ php-src/ext/pdo/pdo_dbh.c Wed Sep 12 18:26:49 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.16 2007/08/30 14:06:12 bjori Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17 2007/09/12 18:26:49 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -1453,12 +1453,6 @@
}
}
- if (dbh->properties) {
- zend_hash_destroy(dbh->properties);
- efree(dbh->properties);
- dbh->properties = NULL;
- }
-
pefree(dbh, dbh->is_persistent);
}
@@ -1478,6 +1472,12 @@
dbh->methods->rollback(dbh TSRMLS_CC);
dbh->in_txn = 0;
}
+
+ if (dbh->properties) {
+ zend_hash_destroy(dbh->properties);
+ efree(dbh->properties);
+ dbh->properties = NULL;
+ }
if (!dbh->is_persistent) {
dbh_free(dbh TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
