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

[Antony Dovgal]

tony2001                Sun Nov 27 13:36:11 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/pdo_oci        config.m4 oci_driver.c 
  Log:
  MFH: plug memory leak
  fix config.m4
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.14.2.1&r2=1.14.2.2&ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.14.2.1 
php-src/ext/pdo_oci/config.m4:1.14.2.2
--- php-src/ext/pdo_oci/config.m4:1.14.2.1      Sat Sep 24 19:23:24 2005
+++ php-src/ext/pdo_oci/config.m4       Sun Nov 27 13:36:11 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.14.2.1 2005/09/24 23:23:24 sniper Exp $
+dnl $Id: config.m4,v 1.14.2.2 2005/11/27 18:36:11 tony2001 Exp $
 
 if test "$PHP_PDO" != "no"; then
 
@@ -35,7 +35,7 @@
 
 if test "$PHP_PDO_OCI" != "no"; then
   AC_MSG_CHECKING([Oracle Install-Dir])
-  if test "$PHP_PDO_OCI" = "yes" -o -z "$PHP_PDO_OCI"; then
+  if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
     PDO_OCI_DIR=$ORACLE_HOME
   else
     PDO_OCI_DIR=$PHP_PDO_OCI
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.2&r2=1.24.2.3&ty=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.2 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.3
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.2   Sat Sep 10 21:42:38 2005
+++ php-src/ext/pdo_oci/oci_driver.c    Sun Nov 27 13:36:11 2005
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: oci_driver.c,v 1.24.2.2 2005/09/11 01:42:38 wez Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.3 2005/11/27 18:36:11 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -149,10 +149,10 @@
                 * so that we can catch the error information when execute
                 * is called via query.  See Bug #33707 */
                if (H->einfo.errmsg) {
-                       efree(H->einfo.errmsg);
+                       pefree(H->einfo.errmsg, dbh->is_persistent);
                }
                H->einfo = *einfo;
-               H->einfo.errmsg = einfo->errmsg ? estrdup(einfo->errmsg) : NULL;
+               H->einfo.errmsg = einfo->errmsg ? pestrdup(einfo->errmsg, 
dbh->is_persistent) : NULL;
                strcpy(dbh->error_code, stmt->error_code);
        }
 

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