morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12179 from akallabeth/wlog-cleanup

Browse Source 
Wlog cleanup
This commit is contained in:
akallabeth
2026-01-23 23:16:23 +01:00
committed by GitHub
parent 2a17cfa8f0 ea419300b7
commit 0e66a9c4cb
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/common/file.c
View File

@@ -716,6 +716,9 @@ static BOOL freerdp_client_rdp_file_set_string(rdpFile* file, const char* name,
if (targetValue)
{
if ((uintptr_t)(*targetValue) != UINTPTR_MAX)
free(*targetValue);
*targetValue = _strdup(value);
if (!(*targetValue))
return FALSE;

30
libfreerdp/utils/signal.c
View File

@@ -195,6 +195,35 @@ static BOOL register_handlers(const int* signals, size_t count, void (*handler)(
return TRUE;
}
static void unregister_handlers(const int* signals, size_t count)
{
WINPR_ASSERT(signals || (count == 0));
sigset_t orig_set = { 0 };
struct sigaction saction = { 0 };
pthread_sigmask(SIG_BLOCK, &(saction.sa_mask), &orig_set);
sigfillset(&(saction.sa_mask));
sigdelset(&(saction.sa_mask), SIGCONT);
saction.sa_handler = SIG_IGN;
saction.sa_flags = 0;
for (size_t x = 0; x < count; x++)
{
sigaction(signals[x], &saction, NULL);
}
pthread_sigmask(SIG_SETMASK, &orig_set, NULL);
}
static void unregister_all_handlers(void)
{
unregister_handlers(fatal_signals, ARRAYSIZE(fatal_signals));
unregister_handlers(term_signals, ARRAYSIZE(term_signals));
}
int freerdp_handle_signals(void)
{
int rc = -1;
@@ -203,6 +232,7 @@ int freerdp_handle_signals(void)
WLog_DBG(TAG, "Registering signal hook...");
(void)atexit(unregister_all_handlers);
if (!register_handlers(fatal_signals, ARRAYSIZE(fatal_signals), fatal_handler))
goto fail;
if (!register_handlers(term_signals, ARRAYSIZE(term_signals), term_handler))

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

@@ -74,10 +74,6 @@ static BOOL WLog_ParseFilter(wLog* root, wLogFilter* filter, LPCSTR name);
static BOOL WLog_ParseFilters(wLog* root);
static wLog* WLog_Get_int(wLog* root, LPCSTR name);
#if !defined(_WIN32)
static void WLog_Uninit_(void) __attribute__((destructor));
#endif
static void WLog_Uninit_(void)
{
wLog* child = NULL;