stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[memleak] Plug memory leak in service destruction

Browse source 
(cherry picked from commit 9338b9529e)
This commit is contained in:
Andreas Öman 2012-11-07 09:28:18 +01:00 • committed by Adam Sutton
parent 4380a8051d
commit 10f7cb6f5c
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/service.c
View file

@ -110,18 +110,21 @@ stream_clean(elementary_stream_t *st)
st->es_global_data_len = 0;
}
/**
*
*/
void
service_stream_destroy(service_t *t, elementary_stream_t *st)
service_stream_destroy(service_t *t, elementary_stream_t *es)
{
if(t->s_status == SERVICE_RUNNING)
stream_clean(st);
TAILQ_REMOVE(&t->s_components, st, es_link);
free(st->es_nicename);
free(st);
stream_clean(es);
avgstat_flush(&es->es_rate);
avgstat_flush(&es->es_cc_errors);
TAILQ_REMOVE(&t->s_components, es, es_link);
free(es->es_nicename);
free(es);
}
/**
@ -487,17 +490,17 @@ service_destroy(service_t *t)
free(t->s_provider);
free(t->s_dvb_charset);
while((st = TAILQ_FIRST(&t->s_components)) != NULL) {
TAILQ_REMOVE(&t->s_components, st, es_link);
free(st->es_nicename);
free(st);
}
while((st = TAILQ_FIRST(&t->s_components)) != NULL)
service_stream_destroy(t, st);
free(t->s_pat_section);
free(t->s_pmt_section);
sbuf_free(&t->s_tsbuf);
avgstat_flush(&t->s_cc_errors);
avgstat_flush(&t->s_rate);
service_unref(t);
if(ch != NULL) {