tony2001 Mon Jan 17 10:06:57 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.179&r2=1.179.2.1&ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.179 php-src/ext/odbc/php_odbc.c:1.179.2.1
--- php-src/ext/odbc/php_odbc.c:1.179 Thu Jul 15 11:09:12 2004
+++ php-src/ext/odbc/php_odbc.c Mon Jan 17 10:06:56 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.179 2004/07/15 15:09:12 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.179.2.1 2005/01/17 15:06:56 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2670,15 +2670,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
