MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-31 17:43:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

[web] Coverity fixups

Browse Source
This commit is contained in:
ejurgensen 2022-01-20 20:09:50 +01:00
parent 3e099072e8
commit dcb3973aa4
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/websocket.c
View File

@ -23,7 +23,6 @@
#include <json.h> #include <json.h>
#include <libwebsockets.h> #include <libwebsockets.h>
#include <pthread.h> #include <pthread.h>
#include <errno.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -511,13 +510,19 @@ websocket_init(void)
return -1; return -1;
} }
pthread_mutex_init(&websocket_write_event_lock, NULL); ret = mutex_init(&websocket_write_event_lock);
websocket_write_events = 0; if (ret < 0)
{
DPRINTF(E_LOG, L_WEB, "Failed to initialize mutex: %s\n", strerror(ret));
lws_context_destroy(context);
return -1;
}
ret = pthread_create(&tid_websocket, NULL, websocket, NULL); ret = pthread_create(&tid_websocket, NULL, websocket, NULL);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_WEB, "Could not spawn websocket thread: %s\n", strerror(errno)); DPRINTF(E_LOG, L_WEB, "Could not spawn websocket thread (%d): %s\n", ret, strerror(ret));
pthread_mutex_destroy(&websocket_write_event_lock);
lws_context_destroy(context); lws_context_destroy(context);
return -1; return -1;
} }
@ -530,10 +535,15 @@ websocket_init(void)
void void
websocket_deinit(void) websocket_deinit(void)
{ {
if (websocket_port > 0) int ret;
{
websocket_exit = true; if (websocket_port <= 0)
pthread_join(tid_websocket, NULL); return;
pthread_mutex_destroy(&websocket_write_event_lock);
} websocket_exit = true;
ret = pthread_join(tid_websocket, NULL);
if (ret < 0)
DPRINTF(E_LOG, L_WEB, "Error joining websocket thread (%d): %s\n", ret, strerror(ret));
pthread_mutex_destroy(&websocket_write_event_lock);
} }