wez             Fri Jun 10 22:50:23 2005 EDT

  Modified files:              
    /php-src/ext/pdo    pdo_dbh.c 
  Log:
  couple of conceptual errors here
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.74&r2=1.75&ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.74 php-src/ext/pdo/pdo_dbh.c:1.75
--- php-src/ext/pdo/pdo_dbh.c:1.74      Fri Jun 10 01:47:55 2005
+++ php-src/ext/pdo/pdo_dbh.c   Fri Jun 10 22:50:20 2005
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_dbh.c,v 1.74 2005/06/10 05:47:55 wez Exp $ */
+/* $Id: pdo_dbh.c,v 1.75 2005/06/11 02:50:20 wez Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1116,11 +1116,10 @@
 
 static void pdo_dbh_free_storage(pdo_dbh_t *dbh TSRMLS_DC)
 {
-       if (dbh->methods->rollback) {
+       if (dbh->methods && dbh->methods->rollback) {
                /* roll back transactions, that are possibly nested, even 
though we don't
                 * official support them */
-               while (dbh->methods->rollback(dbh TSRMLS_CC))
-                       ;
+               dbh->methods->rollback(dbh TSRMLS_CC);
                dbh->in_txn = 0;
        }
        

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to