From b0e31dd88018a6fb4373bcb05b6afab104f1401e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 19 Nov 2014 13:50:54 +0100 Subject: [PATCH] DVR: Move freeing of some variables to dvr_entry_dec_ref() --- src/dvr/dvr_db.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c index 926535ac..7ed7e016 100644 --- a/src/dvr/dvr_db.c +++ b/src/dvr/dvr_db.c @@ -642,6 +642,8 @@ dvr_entry_dec_ref(dvr_entry_t *de) if (de->de_title) lang_str_destroy(de->de_title); if (de->de_desc) lang_str_destroy(de->de_desc); if (de->de_bcast) de->de_bcast->putref((epg_object_t*)de->de_bcast); + free(de->de_channel_name); + free(de->de_episode); free(de); } @@ -670,10 +672,6 @@ dvr_entry_destroy(dvr_entry_t *de, int delconf) LIST_REMOVE(de, de_channel_link); LIST_REMOVE(de, de_global_link); de->de_channel = NULL; - free(de->de_channel_name); - de->de_channel_name = NULL; - free(de->de_episode); - de->de_episode = NULL; dvr_entry_dec_ref(de); }