[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite sqlite_driver.c

[Ilia Alshanetsky]

iliaa           Tue Dec 20 14:50:12 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/pdo_sqlite     sqlite_driver.c 
  Log:
  Proper error handling for persistent connections.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_sqlite/sqlite_driver.c?r1=1.20.2.3&r2=1.20.2.4&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_driver.c
diff -u php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.3 
php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.4
--- php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.3     Mon Dec 19 16:33:46 2005
+++ php-src/ext/pdo_sqlite/sqlite_driver.c      Tue Dec 20 14:50:12 2005
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: sqlite_driver.c,v 1.20.2.3 2005/12/19 16:33:46 iliaa Exp $ */
+/* $Id: sqlite_driver.c,v 1.20.2.4 2005/12/20 14:50:12 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -43,9 +43,9 @@
 
        if (einfo->errcode != SQLITE_OK) {
                if (einfo->errmsg) {
-                       efree(einfo->errmsg);
+                       pefree(einfo->errmsg, dbh->is_persistent);
                }
-               einfo->errmsg = estrdup((char*)sqlite3_errmsg(H->db));
+               einfo->errmsg = pestrdup((char*)sqlite3_errmsg(H->db), 
dbh->is_persistent);
        } else { /* no error */
                strcpy(*pdo_err, PDO_ERR_NONE);
                return 0;
@@ -144,7 +144,7 @@
                        H->db = NULL;
                }
                if (einfo->errmsg) {
-                       efree(einfo->errmsg);
+                       pefree(einfo->errmsg, dbh->is_persistent);
                        einfo->errmsg = NULL;
                }
                pefree(H, dbh->is_persistent);

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