From b365cd1ac736ee638781ee073291f788c8ef390c Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Mon, 3 Sep 2012 09:51:04 +0100 Subject: [PATCH] Fix error in installation of PMT tables, wrong ptr was used. --- src/dvb/dvb_tables.c | 4 ++-- src/dvb/dvb_transport.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dvb/dvb_tables.c b/src/dvb/dvb_tables.c index cee8bae1..3cf9bf70 100644 --- a/src/dvb/dvb_tables.c +++ b/src/dvb/dvb_tables.c @@ -290,8 +290,8 @@ tdt_add(th_dvb_mux_instance_t *tdmi, struct dmx_sct_filter_params *fparams, LIST_FOREACH(t, &tdmi->tdmi_tables, tdt_link) { if(pid == t->tdt_pid && t->tdt_callback == callback && t->tdt_opaque == opaque) { - free(tdt); - free(fparams); + if (tdt) free(tdt); + if (fparams) free(fparams); return; } } diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c index 1835d481..2c2d1c84 100644 --- a/src/dvb/dvb_transport.c +++ b/src/dvb/dvb_transport.c @@ -142,7 +142,7 @@ dvb_transport_start(service_t *t, unsigned int weight, int force_start) if(!r) dvb_transport_open_demuxers(tda, t); - dvb_table_add_pmt(tdmi, t->s_pmt_pid); + dvb_table_add_pmt(t->s_dvb_mux_instance, t->s_pmt_pid); return r; }