* serv_chat.c: fix buffer overrun that was resulting in segv's

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 50d62cc57cc093c0673ec53b5b93383896b5a4e2..44995495a2c085e41ec0196f8b0a3a681af61720 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,6 @@
+1998-10-09 Nathan Bryant <bryant@cs.usm.maine.edu>
+       * serv_chat.c: fix buffer overrun that was resulting in segv's
+
 Fri Oct  9 13:22:37 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Implemented "lazy mode" traversal - pressing the space bar will do
          <N>ext messsage, <G>oto next room, or read <N>ew as appropriate.

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 57c6c852c6165f4739e1a23b53de3dafb2a9a356..2d1a75f8e4799daa7e4469f0fe7730f9f563aa6c 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -96,7 +96,8 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
        time(&now);
        clnew->next = NULL;
        clnew->chat_time = now;
-       strncpy(clnew->chat_room, roomname, ROOMNAMELEN-1);
+       strncpy(clnew->chat_room, roomname, sizeof clnew->chat_room);
+       clnew->chat_room[sizeof clnew->chat_room - 1] = 0;
        if (username)
           strncpy(clnew->chat_username, username, 31); 
        else