From 3b12754d1faae8f2e92fd35a7ac7f5a61737be95 Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Fri, 6 Jul 2012 15:19:12 +0100
Subject: [PATCH] Stop addition of channels with empty names.

---
 src/channels.c        | 4 ++++
 src/dvr/dvr_autorec.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/channels.c b/src/channels.c
index ad332630..802787a1 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -164,6 +164,8 @@ channel_create(const char *name, int number)
   channel_t *ch, *x;
   int id;
 
+  if (!name || !*name) return NULL;
+
   ch = RB_LAST(&channel_identifier_tree);
   if(ch == NULL) {
     id = 1;
@@ -330,6 +332,8 @@ channel_rename(channel_t *ch, const char *newname)
 
   lock_assert(&global_lock);
 
+  if (!newname || !*newname) return 0;
+
   if(channel_find_by_name(newname, 0, 0))
     return -1;
 
diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
index 5f59e3d2..ad9cb442 100644
--- a/src/dvr/dvr_autorec.c
+++ b/src/dvr/dvr_autorec.c
@@ -91,7 +91,7 @@ autorec_cmp(dvr_autorec_entry_t *dae, epg_broadcast_t *e)
   if(dae->dae_title != NULL && dae->dae_title[0] != '\0') {
     if(e->episode->title == NULL ||
        regexec(&dae->dae_title_preg, e->episode->title, 0, NULL, 0))
-    return 0;
+      return 0;
   }
 
   // Note: ignore channel test if we allow quality unlocking