From: Antony Dovgal Date: Mon, 17 Jan 2005 15:06:56 +0000 (+0000) Subject: MFH: fix leak X-Git-Tag: php-5.0.4RC1~335 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19f071ea5a2b1d59094ad2c4104cab5b2b8e51d1;p=php MFH: fix leak --- diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 0908ce6a5b..92f8287a90 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2670,15 +2670,17 @@ static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode) } 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 {