updates.

[silc.git] / apps / silcd / packet_receive.c

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index e4c3bd3572061988e8fa33b66e8eaf53fb53b441..50111068f314d9ca3448a3675b2cd8dc566835ec 100644 (file)
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -1537,9 +1537,9 @@ static void silc_server_new_id_real(SilcServer server,
   else
     id_list = server->global_list;
 
-  /* If the packet is coming from router then use the sender as the
+  /* If the packet is coming from server then use the sender as the
      origin of the the packet. If it came from router then check the real
-     sender of the packet and use that as he origin. */
+     sender of the packet and use that as the origin. */
   if (sock->type == SILC_SOCKET_TYPE_SERVER) {
     router_sock = sock;
     router = sock->user_data;
@@ -1551,9 +1551,10 @@ static void silc_server_new_id_real(SilcServer server,
     if (!router)
       router = silc_idlist_find_server_by_id(server->local_list,
                                             sender_id, NULL);
-    assert(router != NULL);
-    router_sock = sock;
     silc_free(sender_id);
+    if (!router)
+      goto out;
+    router_sock = sock;
   }
 
   switch(id_type) {