Do not crash if topic was not set in LIST.
authorPekka Riikonen <priikone@silcnet.org>
Mon, 4 Nov 2002 19:22:40 +0000 (19:22 +0000)
committerPekka Riikonen <priikone@silcnet.org>
Mon, 4 Nov 2002 19:22:40 +0000 (19:22 +0000)
apps/irssi/src/silc/core/client_ops.c

index d8db45c8475c75ad78bf0a5d95031c3ff513d138..d8158bdd7faebdb88a8317274a0cb4de47f3d765 100644 (file)
@@ -1375,7 +1375,8 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
       topic = va_arg(vp, char *);
       usercount = va_arg(vp, int);
 
-      if (!silc_term_utf8() && silc_utf8_valid(topic, strlen(topic))) {
+      if (topic && !silc_term_utf8() &&
+         silc_utf8_valid(topic, strlen(topic))) {
        memset(tmp, 0, sizeof(tmp));
        cp = tmp;
        if (strlen(topic) > sizeof(tmp) - 1) {
@@ -1607,7 +1608,8 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
       channel = va_arg(vp, SilcChannelEntry);
       topic = va_arg(vp, char *);
 
-      if (!silc_term_utf8() && silc_utf8_valid(topic, strlen(topic))) {
+      if (topic && !silc_term_utf8() &&
+         silc_utf8_valid(topic, strlen(topic))) {
        memset(tmp, 0, sizeof(tmp));
        cp = tmp;
        if (strlen(topic) > sizeof(tmp) - 1) {