channel tags: more strict checking for tag create

diff --git a/src/channels.c b/src/channels.c
index 9c49cd4c687258b982f67256d5abb934bcdb3692..412834013dbe63f7dc3def1a7f864c96b7b5523f 100644 (file)
--- a/src/channels.c
+++ b/src/channels.c
@@ -929,6 +929,9 @@ channel_tag_map(channel_tag_t *ct, channel_t *ch, void *origin)
 {
   idnode_list_mapping_t *ilm;
 
+  if (ct == NULL || ch == NULL)
+    return NULL;
+
   ilm = idnode_list_link(&ct->ct_id, &ct->ct_ctms,
                          &ch->ch_id, &ch->ch_ctms,
                          origin);
@@ -1232,7 +1235,7 @@ channel_tag_find_by_name(const char *name, int create)
 {
   channel_tag_t *ct;
 
-  if (name == NULL)
+  if (name == NULL || *name == '\0')
     return NULL;
 
   TAILQ_FOREACH(ct, &channel_tags, ct_link)