From: mattn Date: Fri, 25 Jul 2008 19:14:48 +0000 (+0000) Subject: * fixed a warning and an error in the overflow check in l_net X-Git-Tag: xonotic-v0.7.0~16^2~12^2~71 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e5c89d2c041fa4fa48288e94aad14a4a25f86ec;p=xonotic%2Fnetradiant.git * fixed a warning and an error in the overflow check in l_net * const stuff for GetNextChainItem (bobtoolz) git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@303 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- diff --git a/contrib/bobtoolz/misc.cpp b/contrib/bobtoolz/misc.cpp index a061e867..9786661a 100644 --- a/contrib/bobtoolz/misc.cpp +++ b/contrib/bobtoolz/misc.cpp @@ -49,7 +49,7 @@ const char* GetCurrentTexture() return g_CurrentTexture; } -epair_t* GetNextChainItem(epair_t* lastItem, char* key, char* value) +epair_t* GetNextChainItem(epair_t* lastItem, const char* key, const char* value) { epair_t* nextEPair = g_FuncTable.m_pfnAllocateEpair(key, value); @@ -259,9 +259,9 @@ void StartBSP() GetFilename(exename, "q3map"); UnixToDosPath(exename); // do we want this done in linux version? - char mapname[256]; + char mapname[256]; const char *pn = g_FuncTable.m_pfnReadProjectKey("mapspath"); - + strcpy( mapname, pn ); strcat( mapname, "/ac_prt.map" ); UnixToDosPath(mapname); @@ -279,7 +279,7 @@ void BuildMiniPrt(list* exclusionList) // doors, etc DEntity world; - + char buffer[128]; const char *pn = g_FuncTable.m_pfnReadProjectKey("mapspath"); diff --git a/contrib/bobtoolz/misc.h b/contrib/bobtoolz/misc.h index 81b48879..7ccb4599 100644 --- a/contrib/bobtoolz/misc.h +++ b/contrib/bobtoolz/misc.h @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA vec_t Min(vec_t a, vec_t b); -epair_t* GetNextChainItem(epair_t* lastItem, char* key, char* value); +epair_t* GetNextChainItem(epair_t* lastItem, const char* key, const char* value); // reads current texture into global, returns pointer to it const char* GetCurrentTexture(); diff --git a/libs/l_net/l_net.c b/libs/l_net/l_net.c index a8a59571..49f2014c 100644 --- a/libs/l_net/l_net.c +++ b/libs/l_net/l_net.c @@ -483,7 +483,7 @@ void NMSG_WriteString(netmessage_t *msg, char *string) WinPrint("NMSG_WriteString: overflow\n"); return; } //end if - strcpy(&msg->data[msg->size], string); + memcpy(&msg->data[msg->size], string, strlen(string) + 1); msg->size += strlen(string) + 1; } //end of the function NMSG_WriteString //=========================================================================== @@ -505,7 +505,7 @@ void NMSG_ReadStart(netmessage_t *msg) //=========================================================================== int NMSG_ReadChar(netmessage_t *msg) { - if (msg->size + 1 > msg->size) + if (msg->read + 1 > msg->size) { msg->readoverflow = qtrue; WinPrint("NMSG_ReadChar: read overflow\n"); @@ -607,7 +607,7 @@ char *NMSG_ReadString(netmessage_t *msg) { static char string[2048]; int l, c; - + l = 0; do {