oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/raop: merge raopcl_close() into _finish()

Browse Source 
.. and fix a double free bug.
This commit is contained in:
Max Kellermann
2011-08-30 22:19:52 +02:00
parent bd67e986f4
commit 34d9d8abd4
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/output/raop_output_plugin.c
View File

@@ -562,15 +562,6 @@ raopcl_connect(struct raop_data *rd, GError **error_r)
return rval; return rval;
} }
static void
raopcl_close(struct raop_data *rd)
{
if (rd->rtspcl)
rtspcl_close(rd->rtspcl);
rd->rtspcl = NULL;
g_free(rd);
}
static int static int
difference (struct timeval *t1, struct timeval *t2) difference (struct timeval *t1, struct timeval *t2)
{ {
@@ -666,7 +657,10 @@ static void
raop_output_finish(void *data) raop_output_finish(void *data)
{ {
struct raop_data *rd = data; struct raop_data *rd = data;
raopcl_close(rd);
if (rd->rtspcl)
rtspcl_close(rd->rtspcl);
g_mutex_free(rd->control_mutex); g_mutex_free(rd->control_mutex);
g_free(rd); g_free(rd);
} }