pidgin/ljfisher-ssl-client-auth

silc: Avoid calling strstr(NULL, ...) if chname isn't set.

2011-05-11, Paul Aurich
f615f176ce58
Parents e26c45c86ea7
Children bd26fd17a865
silc: Avoid calling strstr(NULL, ...) if chname isn't set.
1 files changed, 4 insertions(+), 3 deletions(-)
  • +4 -3
    libpurple/protocols/silc/chat.c
    • --- a/libpurple/protocols/silc/chat.c Wed May 11 04:20:12 2011 +0000
    +++ b/libpurple/protocols/silc/chat.c Wed May 11 04:29:56 2011 +0000
    @@ -894,9 +894,10 @@
    if (components)
    chname = g_hash_table_lookup(components, "channel");
    - if (chname)
    - channel = silc_client_get_channel(sg->client, sg->conn,
    - (char *)chname);
    + if (!chname)
    + return NULL;
    + channel = silc_client_get_channel(sg->client, sg->conn,
    + (char *)chname);
    if (channel) {
    chu = silc_client_on_channel(channel, conn->local_entry);
    if (chu)