mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate feedback from pull request (#2492)

Browse Source 
* shell: add missing NULL checks
* thread: handle case where HAVE_EVENTFD_H isn't defined
* wlog: return NULL instead of 0
* wlog: use g_RootLog instead of WLog_GetRoot
  otherwise a new root might be initialized on uninit
* indentation and style fixes
This commit is contained in:
Bernhard Miklautz 2015-03-25 17:37:46 +01:00
parent f2b4709cbd
commit 1d7b3694a9
6 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winpr/libwinpr/file/file.c
View File

@ -811,6 +811,8 @@ char* GetNamedPipeUnixDomainSocketBaseFilePathA()
char* lpTempPath;
char* lpPipePath;
lpTempPath = GetKnownPath(KNOWN_PATH_TEMP);
if (!lpTempPath)
return NULL;
lpPipePath = GetCombinedPath(lpTempPath, ".pipe");
free(lpTempPath);
return lpPipePath;

2
winpr/libwinpr/io/device.c
View File

@ -84,6 +84,8 @@ char* GetDeviceFileUnixDomainSocketBaseFilePathA()
char* lpPipePath;
lpTempPath = GetKnownPath(KNOWN_PATH_TEMP);
if (!lpTempPath)
return NULL;
lpPipePath = GetCombinedPath(lpTempPath, ".device");
free(lpTempPath);

10
winpr/libwinpr/path/shell.c
View File

@ -115,8 +115,15 @@ char* GetPath_XDG_DATA_HOME()
return path;
home = GetPath_HOME();
if (!home)
return NULL;
path = (char*) malloc(strlen(home) + strlen("/.local/share") + 1);
if (!path)
{
free(home);
return NULL;
}
sprintf(path, "%s%s", home, "/.local/share");
free(home);
@ -147,6 +154,9 @@ char* GetPath_XDG_CONFIG_HOME()
if (!home)
home = GetPath_TEMP();
if (!home)
return NULL;
path = (char*) malloc(strlen(home) + strlen("/.config") + 1);
if (!path)
{

10
winpr/libwinpr/thread/thread.c
View File

@ -380,7 +380,10 @@ HANDLE CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, SIZE_T dwStackSize
if(pthread_mutex_init(&thread->mutex, 0) != 0)
{
WLog_ERR(TAG, "failed to initialize thread mutex");
close(thread->pipe_fd[0]);
if (thread->pipe_fd[0])
close(thread->pipe_fd[0]);
if (thread->pipe_fd[1])
close(thread->pipe_fd[1]);
free(thread);
return NULL;
}
@ -394,7 +397,10 @@ HANDLE CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, SIZE_T dwStackSize
if (!thread_list)
{
WLog_ERR(TAG, "Couldn't create global thread list");
close(thread->pipe_fd[0]);
if (thread->pipe_fd[0])
close(thread->pipe_fd[0]);
if (thread->pipe_fd[1])
close(thread->pipe_fd[1]);
free(thread);
return NULL;
}

19
winpr/libwinpr/utils/collections/PubSub.c
View File

@ -207,19 +207,18 @@ wPubSub* PubSub_New(BOOL synchronized)
if (!pubSub)
return NULL;
pubSub->synchronized = synchronized;
pubSub->synchronized = synchronized;
if (pubSub->synchronized)
if (!InitializeCriticalSectionAndSpinCount(&pubSub->lock, 4000))
{
free(pubSub);
return NULL;
}
if (pubSub->synchronized && !InitializeCriticalSectionAndSpinCount(&pubSub->lock, 4000))
{
free(pubSub);
return NULL;
}
pubSub->count = 0;
pubSub->size = 64;
pubSub->count = 0;
pubSub->size = 64;
pubSub->events = (wEventType*) calloc(1, sizeof(wEventType) * pubSub->size);
pubSub->events = (wEventType*) calloc(1, sizeof(wEventType) * pubSub->size);
if (!pubSub->events)
{
if (pubSub->synchronized)

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

@ -525,7 +525,7 @@ wLog* WLog_New(LPCSTR name, wLog* rootLogger)
log = (wLog*) calloc(1, sizeof(wLog));
if (!log)
return 0;
return NULL;
log->Name = _strdup(name);
@ -730,7 +730,7 @@ void WLog_Uninit()
{
DWORD index;
wLog* child = NULL;
wLog* root = WLog_GetRoot();
wLog* root = g_RootLog;
if (!root)
return;