ctlinnd trace: Check the validity of a channel

... otherwise innd dies. close #287
InterNetNews · Dec 9, 2023 · eac879b · eac879b
1 parent ef575f8
commit eac879b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/doc/pod/news.pod b/doc/pod/news.pod
@@ -54,6 +54,10 @@ is not.  Thanks to Enrik Berkhan for the patch for B<nnrpd>.
 
 =item *
 
+B<innd> no longer dies when C<ctlinnd trace> is run on an invalid channel.
+
+=item *
+
 INN now properly handles header field names starting with a leading dot:
 
 =over 2

diff --git a/innd/cc.c b/innd/cc.c
@@ -1864,7 +1864,8 @@ CCtrace(char *av[])
     case '7':
     case '8':
     case '9':
-        if ((cp = CHANfromdescriptor(atoi(p))) == NULL)
+        cp = CHANfromdescriptor(atoi(p));
+        if (cp == NULL || cp->Type == CTfree)
             return CCnochannel;
         CHANtracing(cp, Flag);
         break;