tony2001 Mon Jan 17 10:05:13 2005 EDT
Modified files:
/php-src/ext/odbc php_odbc.c
Log:
fix leak appearing when odbc_errormsg() got invalid resource
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.182&r2=1.183&ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.182 php-src/ext/odbc/php_odbc.c:1.183
--- php-src/ext/odbc/php_odbc.c:1.182 Wed Jan 12 21:06:39 2005
+++ php-src/ext/odbc/php_odbc.c Mon Jan 17 10:05:11 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.182 2005/01/13 02:06:39 wez Exp $ */
+/* $Id: php_odbc.c,v 1.183 2005/01/17 15:05:11 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2712,15 +2712,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
