From d186fb6111722f10c30d4e5b93c643d8261fca2c Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Fri, 17 Nov 2006 21:45:51 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@707 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/md2.h | 5 +++-- source/src/server.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/src/md2.h b/source/src/md2.h index e398c4bb..d95b61f6 100644 --- a/source/src/md2.h +++ b/source/src/md2.h @@ -106,8 +106,9 @@ struct md2 : vertmodel int *glcommands = new int[header.numglcommands]; fseek(file, header.offsetglcommands, SEEK_SET); - fread(glcommands, header.numglcommands*sizeof(int), 1, file); - endianswap(glcommands, sizeof(int), header.numglcommands); + int numglcommands = fread(glcommands, sizeof(int), header.numglcommands, file); + endianswap(glcommands, sizeof(int), numglcommands); + glcommands[numglcommands < header.numglcommands ? numglcommands : numglcommands-1] = 0; vector tcgen; vector trigen; diff --git a/source/src/server.cpp b/source/src/server.cpp index 40f2e161..7f4b3dd6 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -574,7 +574,7 @@ void process(ENetPacket *packet, int sender, int chan) // sender may be -1 if(!cl->name[0]) newclient = true; getstring(text, p); if(!text[0]) s_strcpy(text, "unarmed"); - s_strcpy(cl->name, text); + s_strncpy(cl->name, text, MAXNAMELEN+1); if(newclient) { clientscore *sc = findscore(*cl, false);