DVR: add extra channel access checks to channel_set functions

tvheadend · Apr 11, 2016 · 57f8bca · 57f8bca
1 parent 679ed1c
commit 57f8bca
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/src/channels.c b/src/channels.c
@@ -596,7 +596,7 @@ channel_access(channel_t *ch, access_t *a, int disabled)
 {
   char ubuf[UUID_HEX_SIZE];
 
-  if (!ch)
+  if (!ch || !a)
     return 0;
 
   if (!disabled && !ch->ch_enabled)

diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
@@ -483,6 +483,8 @@ dvr_autorec_entry_class_channel_set(void *o, const void *v)
       return 1;
     }
   } else if (dae->dae_channel != ch) {
+    if (!channel_access(ch, dae->dae_id.in_access, 1))
+      return 0;
     if (dae->dae_channel)
       LIST_REMOVE(dae, dae_channel_link);
     dae->dae_channel = ch;

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
@@ -2271,6 +2271,8 @@ dvr_entry_class_channel_set(void *o, const void *v)
       return 1;
     }
   } else if (de->de_channel != ch) {
+    if (!channel_access(ch, de->de_id.in_access, 1))
+      return 0;
     if (de->de_channel)
       LIST_REMOVE(de, de_channel_link);
     free(de->de_channel_name);

diff --git a/src/dvr/dvr_timerec.c b/src/dvr/dvr_timerec.c
@@ -327,6 +327,8 @@ dvr_timerec_entry_class_channel_set(void *o, const void *v)
       return 1;
     }
   } else if (dte->dte_channel != ch) {
+    if (!channel_access(ch, dte->dte_id.in_access, 1))
+      return 0;
     if (dte->dte_channel)
       LIST_REMOVE(dte, dte_channel_link);
     dte->dte_channel = ch;