fix leak appearing when odbc_errormsg() got invalid resource

21 years ago · acbdbe1e65
1 changed files with 3 additions and 1 deletions
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@ -2712,15 +2712,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 {