[PHP-CVS] cvs: php-src(PHP_4_3) /ext/odbc php_odbc.c

[Antony Dovgal]

tony2001                Mon Jan 17 10:07:46 2005 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/odbc   php_odbc.c 
  Log:
  MFH: fix leak
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.143.2.17&r2=1.143.2.18&ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.143.2.17 
php-src/ext/odbc/php_odbc.c:1.143.2.18
--- php-src/ext/odbc/php_odbc.c:1.143.2.17      Thu Jun 17 20:44:40 2004
+++ php-src/ext/odbc/php_odbc.c Mon Jan 17 10:07:46 2005
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.17 2004/06/18 00:44:40 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.18 2005/01/17 15:07:46 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2669,15 +2669,17 @@
        } else { /* last error message */
                len = SQL_MAX_MESSAGE_LENGTH;
        }
-       ptr = ecalloc(len + 1, 1);
+       
        if (argc == 1) {
                ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_handle, -1, 
"ODBC-Link", le_conn, le_pconn);
+               ptr = ecalloc(len + 1, 1);
                if (mode == 0) {
                        strlcpy(ptr, conn->laststate, len+1);
                } else {
                        strlcpy(ptr, conn->lasterrormsg, len+1);
                }
        } else {
+               ptr = ecalloc(len + 1, 1);
                if (mode == 0) {
                        strlcpy(ptr, ODBCG(laststate), len+1);
                } else {

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