mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-12-04 15:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

winpr/utils/wlog: Fix leak found by covscan

Browse Source 
leaked_storage: Variable "result" going out of scope leaks the storage it points to.
leaked_storage: Variable "bt" going out of scope leaks the storage it points to.
This commit is contained in:
Ondrej Holy 2018-08-21 10:27:56 +02:00
parent d3c2ceb0f6
commit 10b9c516f6
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winpr/libwinpr/utils/wlog/UdpAppender.c
View File

@ -81,6 +81,7 @@ static BOOL WLog_UdpAppender_Open(wLog* log, wLogAppender* appender)
memcpy(&udpAppender->targetAddr, result->ai_addr, result->ai_addrlen);
udpAppender->targetAddrLen = (int) result->ai_addrlen;
freeaddrinfo(result);
return TRUE;
}

21
winpr/libwinpr/utils/wlog/wlog.c
View File

@ -168,7 +168,8 @@ fail:
static BOOL log_recursion(LPCSTR file, LPCSTR fkt, int line)
{
char** msg;
BOOL status = FALSE;
char** msg = NULL;
size_t used, i;
void* bt = winpr_backtrace(20);
#if defined(ANDROID)
@ -181,37 +182,39 @@ static BOOL log_recursion(LPCSTR file, LPCSTR fkt, int line)
msg = winpr_backtrace_symbols(bt, &used);
if (!msg)
return FALSE;
goto out;
#if defined(ANDROID)
if (__android_log_print(ANDROID_LOG_FATAL, tag, "Recursion detected!!!") < 0)
return FALSE;
goto out;
if (__android_log_print(ANDROID_LOG_FATAL, tag, "Check %s [%s:%d]", fkt, file,
line) < 0)
return FALSE;
goto out;
for (i = 0; i < used; i++)
if (__android_log_print(ANDROID_LOG_FATAL, tag, "%zd: %s", i, msg[i]) < 0)
return FALSE;
goto out;
#else
if (fprintf(stderr, "[%s]: Recursion detected!\n", fkt) < 0)
return FALSE;
goto out;
if (fprintf(stderr, "[%s]: Check %s:%d\n", fkt, file, line) < 0)
return FALSE;
goto out;
for (i = 0; i < used; i++)
if (fprintf(stderr, "%s: %"PRIuz": %s\n", fkt, i, msg[i]) < 0)
return FALSE;
goto out;
#endif
status = TRUE;
out:
free(msg);
winpr_backtrace_free(bt);
return TRUE;
return status;
}
static BOOL WLog_Write(wLog* log, wLogMessage* message)