Check for NULL payloads (can happen with empty message).

diff --git a/lib/silcclient/client_channel.c b/lib/silcclient/client_channel.c
index 68983d59c6f6692dc5adf3837deca7c95632cd1f..679fe5ee5bcea58b7ad439667d83674c394e7ed0 100644 (file)
--- a/lib/silcclient/client_channel.c
+++ b/lib/silcclient/client_channel.c
@@ -111,6 +111,8 @@ void silc_client_send_channel_message(SilcClient client,
   payload = silc_message_payload_encode(flags, data, data_len, TRUE, FALSE,
                                        cipher, hmac, client->rng, NULL,
                                        client->private_key, client->sha1hash);
+  if (!payload)
+    return;
 
   /* Get data used in packet header encryption, keys and stuff. */
   cipher = conn->internal->send_key;

diff --git a/lib/silcclient/client_prvmsg.c b/lib/silcclient/client_prvmsg.c
index 36d7bbe43a7eaffd76fe308eb7980b50da6a9867..9b6f454ab572a77a0f0a2edf8da1b87b61f704a6 100644 (file)
--- a/lib/silcclient/client_prvmsg.c
+++ b/lib/silcclient/client_prvmsg.c
@@ -60,6 +60,8 @@ void silc_client_send_private_message(SilcClient client,
                                       client_entry->hmac_send,
                                       client->rng, NULL, client->private_key,
                                       client->sha1hash);
+  if (!buffer)
+    return;
 
   /* If we don't have private message specific key then private messages
      are just as any normal packet thus call normal packet sending.  If