mpegts table destroy: move the data free calls to the release routine

tvheadend · Jul 26, 2014 · 52e5d7f · 52e5d7f
1 parent 98473cd
commit 52e5d7f
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/input/mpegts/mpegts_table.c b/src/input/mpegts/mpegts_table.c
@@ -107,22 +107,23 @@ mpegts_table_dispatch
 void
 mpegts_table_release_ ( mpegts_table_t *mt )
 {
+  struct mpegts_table_state *st;
+
+  while ((st = RB_FIRST(&mt->mt_state))) {
+    RB_REMOVE(&mt->mt_state, st, link);
+    free(st);
+  }
+  if (mt->mt_destroy)
+    mt->mt_destroy(mt);
   free(mt->mt_name);
   free(mt);
 }
 
 void
 mpegts_table_destroy ( mpegts_table_t *mt )
 {
-  struct mpegts_table_state *st;
   mt->mt_destroyed = 1;
   mt->mt_mux->mm_close_table(mt->mt_mux, mt);
-  while ((st = RB_FIRST(&mt->mt_state))) {
-    RB_REMOVE(&mt->mt_state, st, link);
-    free(st);
-  }
-  if (mt->mt_destroy)
-    mt->mt_destroy(mt);
   mpegts_table_release(mt);
 }