MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-23 03:55:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

[mpd] Fix crash-on-exit because evconnlistener_free() doesn't ignore NULL pointers (issue #430)

Browse Source
This commit is contained in:
ejurgensen 2017-10-30 23:05:18 +01:00
parent b7f5070ad3
commit 04dc5956ed
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mpd.c
View File

@ -4988,8 +4988,11 @@ int mpd_init(void)
if (http_port > 0) if (http_port > 0)
evhttp_free(evhttpd); evhttp_free(evhttpd);
evhttp_fail: evhttp_fail:
evconnlistener_free(mpd_listener); // Note evconnlistener_free segfaults if you give it a null pointer, so we need the if
evconnlistener_free(mpd_listener6); if (mpd_listener)
evconnlistener_free(mpd_listener);
if (mpd_listener6)
evconnlistener_free(mpd_listener6);
connew_fail: connew_fail:
commands_base_free(cmdbase); commands_base_free(cmdbase);
event_base_free(evbase_mpd); event_base_free(evbase_mpd);
@ -5036,8 +5039,11 @@ void mpd_deinit(void)
if (http_port > 0) if (http_port > 0)
evhttp_free(evhttpd); evhttp_free(evhttpd);
evconnlistener_free(mpd_listener); // Note evconnlistener_free segfaults if you give it a null pointer, so we need the if
evconnlistener_free(mpd_listener6); if (mpd_listener)
evconnlistener_free(mpd_listener);
if (mpd_listener6)
evconnlistener_free(mpd_listener6);
// Free event base (should free events too) // Free event base (should free events too)
event_base_free(evbase_mpd); event_base_free(evbase_mpd);