Fixed NEW_CLIENT packet processing crash when the packet doesn't

	include nickname.

diff --git a/CHANGES b/CHANGES
index e6d976c80ddef1dd7420bec490c0d6d31f7aa29f..128c76fc0e4f0c678163c10a901c6b3d6d69f297 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Thu Mar 13 13:31:35 EET 2008  Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed silcd crash in NEW_CLIENT packet handling when nickname
+         is not present in the packet.  Affected files are
+         apps/silcd/packet_receive.c.
+
 Fri Feb 22 16:12:27 EET 2008  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed partial encryption in CTR mode in AES.  Change does not

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index c2c57ed75dee74d14173c59de6f14cb51fc26b0b..786c21a088fd52a8b1896ba385d664b1063dedbe 100644 (file)
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -2145,7 +2145,7 @@ SilcClientEntry silc_server_new_client(SilcServer server,
   if (silc_buffer_unformat(buffer,
                           SILC_STR_UI16_NSTRING_ALLOC(&nickname,
                                                       &nickname_len),
-                          SILC_STR_END)) {
+                          SILC_STR_END) >= 0) {
     if (nickname_len > 128) {
       nickname_len = 128;
       nickname[nickname_len - 1] = '\0';