X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand.c;h=97d074822e6621e51f14714b116e7c734836ca2f;hb=48d89bc2868ec49c2ab9aa74efe9ac703eee8f29;hp=afb042071bd0cf8aa5d41908d101028136bdbb41;hpb=10ec50cff8ad9d6a77080821037c1234dc066b47;p=silc.git

diff --git a/lib/silcclient/command.c b/lib/silcclient/command.c
index afb04207..97d07482 100644
--- a/lib/silcclient/command.c
+++ b/lib/silcclient/command.c
@@ -589,7 +589,13 @@ SILC_CLIENT_CMD_FUNC(ping)
 			  0, NULL, NULL, buffer->data, buffer->len, TRUE);
   silc_buffer_free(buffer);
 
-  id = silc_id_str2id(conn->remote_id_data, SILC_ID_SERVER);
+  id = silc_id_str2id(conn->remote_id_data, conn->remote_id_data_len,
+		      SILC_ID_SERVER);
+  if (!id) {
+    SILC_NOT_CONNECTED(cmd->client, cmd->conn);
+    COMMAND_ERROR;
+    goto out;
+  }
 
   /* Start counting time */
   for (i = 0; i < conn->ping_count; i++) {