[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_oci oci_driver.c

[Matteo Beccati]

mbeccati                Tue May 12 21:53:19 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/pdo_oci        oci_driver.c 
  Log:
  MFH
  - Fixed bug #48070
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.4.2.7.2.4&r2=1.24.2.4.2.7.2.5&diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.4 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.5
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.4   Wed Dec 31 11:15:41 2008
+++ php-src/ext/pdo_oci/oci_driver.c    Tue May 12 21:53:18 2009
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: oci_driver.c,v 1.24.2.4.2.7.2.4 2008/12/31 11:15:41 sebastian Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.4.2.7.2.5 2009/05/12 21:53:18 mbeccati Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -70,15 +70,13 @@
                S = (pdo_oci_stmt*)stmt->driver_data;
                einfo = &S->einfo;
                pdo_err = &stmt->error_code;
-               if (einfo->errmsg) {
-                       efree(einfo->errmsg);
-               }
        }
        else {
                einfo = &H->einfo;
-               if (einfo->errmsg) {
-                       pefree(einfo->errmsg, dbh->is_persistent);
-               }
+       }
+
+       if (einfo->errmsg) {
+               pefree(einfo->errmsg, dbh->is_persistent);
        }
 
        einfo->errmsg = NULL;



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