X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fserver_util.c;h=545ec504320478204ed4152f74d6123711f880a1;hb=0a6ebeedacee8f43f604cddbf7dc6bc113c6515e;hp=3086aef444e2d77a4e4cec4cd46cf344e934ec2a;hpb=b5f81f7a2b18ed82300e98fe42c2759115e34928;p=silc.git

diff --git a/apps/silcd/server_util.c b/apps/silcd/server_util.c
index 3086aef4..545ec504 100644
--- a/apps/silcd/server_util.c
+++ b/apps/silcd/server_util.c
@@ -162,15 +162,17 @@ SilcBool silc_server_remove_clients_by_server(SilcServer server,
 
   if (server_signoff) {
     idp = silc_id_payload_encode(entry->id, SILC_ID_SERVER);
-    argv = silc_realloc(argv, sizeof(*argv) * (argc + 1));
-    argv_lens = silc_realloc(argv_lens,  sizeof(*argv_lens) * (argc + 1));
-    argv_types = silc_realloc(argv_types, sizeof(*argv_types) * (argc + 1));
-    argv[argc] = silc_calloc(silc_buffer_len(idp), sizeof(*argv[0]));
-    memcpy(argv[argc], idp->data, silc_buffer_len(idp));
-    argv_lens[argc] = silc_buffer_len(idp);
-    argv_types[argc] = argc + 1;
-    argc++;
-    silc_buffer_free(idp);
+    if (idp) {
+      argv = silc_realloc(argv, sizeof(*argv) * (argc + 1));
+      argv_lens = silc_realloc(argv_lens,  sizeof(*argv_lens) * (argc + 1));
+      argv_types = silc_realloc(argv_types, sizeof(*argv_types) * (argc + 1));
+      argv[argc] = silc_calloc(silc_buffer_len(idp), sizeof(*argv[0]));
+      memcpy(argv[argc], idp->data, silc_buffer_len(idp));
+      argv_lens[argc] = silc_buffer_len(idp);
+      argv_types[argc] = argc + 1;
+      argc++;
+      silc_buffer_free(idp);
+    }
   }
 
   if (silc_idcache_get_all(server->local_list->clients, &list)) {
@@ -189,17 +191,19 @@ SilcBool silc_server_remove_clients_by_server(SilcServer server,
 
       if (server_signoff) {
 	idp = silc_id_payload_encode(client->id, SILC_ID_CLIENT);
-	argv = silc_realloc(argv, sizeof(*argv) * (argc + 1));
-	argv_lens = silc_realloc(argv_lens, sizeof(*argv_lens) *
-				 (argc + 1));
-	argv_types = silc_realloc(argv_types, sizeof(*argv_types) *
-				  (argc + 1));
-	argv[argc] = silc_calloc(silc_buffer_len(idp), sizeof(*argv[0]));
-	memcpy(argv[argc], idp->data, silc_buffer_len(idp));
-	argv_lens[argc] = silc_buffer_len(idp);
-	argv_types[argc] = argc + 1;
-	argc++;
-	silc_buffer_free(idp);
+	if (idp) {
+	  argv = silc_realloc(argv, sizeof(*argv) * (argc + 1));
+	  argv_lens = silc_realloc(argv_lens, sizeof(*argv_lens) *
+				   (argc + 1));
+	  argv_types = silc_realloc(argv_types, sizeof(*argv_types) *
+				    (argc + 1));
+	  argv[argc] = silc_calloc(silc_buffer_len(idp), sizeof(*argv[0]));
+	  memcpy(argv[argc], idp->data, silc_buffer_len(idp));
+	  argv_lens[argc] = silc_buffer_len(idp);
+	  argv_types[argc] = argc + 1;
+	  argc++;
+	  silc_buffer_free(idp);
+	}
       }
 
       /* Update statistics */