Replaced all calls to str[n]cat and strncpy by calls to strlcat and strlcpy respectively

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6542 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_video.c b/cl_video.c
index 8ea468b3475ed546b02eb6ac8a8307bd4770b776..42c0496d679026ff9e5229329b32cd27bd6321cc 100644 (file)
--- a/cl_video.c
+++ b/cl_video.c
@@ -72,11 +72,11 @@ static qboolean WakeVideo( clvideo_t * video )
 
 static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char *name, int owner )
 {
-       strncpy( video->filename, filename, MAX_QPATH );
+       strlcpy( video->filename, filename, sizeof(video->filename) );
        video->ownertag = owner;
        if( strncmp( name, CLVIDEOPREFIX, sizeof( CLVIDEOPREFIX ) - 1 ) )
                return NULL;
-       strncpy( video->cpif.name, name, MAX_QPATH );
+       strlcpy( video->cpif.name, name, sizeof(video->cpif.name) );
 
        if( !OpenStream( video ) )
                return NULL;

diff --git a/common.h b/common.h
index cfff75b3400bdfd98a5728d3823be24cf4d89103..1306776e50afb2f1dbc81df3df418db636d57cb1 100644 (file)
--- a/common.h
+++ b/common.h
@@ -228,6 +228,13 @@ char       *va(const char *format, ...);
 extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...);
 extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args);
 
+// A bunch of functions are forbidden for security reasons (and also to please MSVS 2005, for some of them)
+#define strcat DO_NOT_USE_STRCAT__USE_STRLCAT
+#define strncat DO_NOT_USE_STRNCAT__USE_STRLCAT_OR_MEMCPY
+//#define strcpy DO_NOT_USE_STRCPY__USE_STRLCPY
+#define strncpy DO_NOT_USE_STRNCPY__USE_STRLCPY_OR_MEMCPY
+//#define sprintf DO_NOT_USE_SPRINTF__USE_DPSNPRINTF
+
 
 //============================================================================
 

diff --git a/csprogs.c b/csprogs.c
index 152b747fb3b5cf99b6ba58235a06135635e90e35..3309a5f4b552e9f835222d8f13b3cf32fe908a01 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -414,10 +414,10 @@ void CSQC_AddPrintText (const char *msg)
                        csqc_printtextbuf[0] = 0;
                }
                else
-                       strcat(csqc_printtextbuf, msg);
+                       strlcat(csqc_printtextbuf, msg, CSQC_PRINTBUFFERLEN);
                return;
        }
-       strcat(csqc_printtextbuf, msg);
+       strlcat(csqc_printtextbuf, msg, CSQC_PRINTBUFFERLEN);
        CL_VM_Parse_Print(csqc_printtextbuf);
        csqc_printtextbuf[0] = 0;
 }

diff --git a/dpvsimpledecode.c b/dpvsimpledecode.c
index d17ced77d5f4ddbb3601e29810ab606c8e54f08b..28536526448f9b584d50e44e1a8a3de012bc9d86 100644 (file)
--- a/dpvsimpledecode.c
+++ b/dpvsimpledecode.c
@@ -392,13 +392,16 @@ void *dpvsimpledecode_open(char *filename, char **errorstring)
                                                        s->videopixels = (unsigned int *)Z_Malloc(s->info_imagewidth * s->info_imageheight * sizeof(*s->videopixels));
                                                        if (s->videopixels != NULL)
                                                        {
-                                                               wavename = (char *)Z_Malloc(strlen(filename) + 10);
+                                                               size_t namelen;
+                                                               
+                                                               namelen = strlen(filename) + 10;
+                                                               wavename = (char *)Z_Malloc(namelen);
                                                                if (wavename)
                                                                {
                                                                        sfx_t* sfx;
 
                                                                        StripExtension(filename, wavename);
-                                                                       strcat(wavename, ".wav");
+                                                                       strlcat(wavename, ".wav", namelen);
                                                                        sfx = S_PrecacheSound (wavename, false, false);
                                                                        if (sfx != NULL)
                                                                                s->sndchan = S_StartSound (-1, 0, sfx, vec3_origin, 1.0f, 0);

diff --git a/keys.c b/keys.c
index 93ddfadaf729da136fc77971f65d65a44cfdb56c..e1831c7cc852e071c4f1db9054283f7ff6304602 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -280,7 +280,7 @@ Key_Console (int key, char ascii)
                        if (i > 0)
                        {
                                cbd[i]=0;
-                               strcat(key_lines[edit_line], cbd);
+                               strlcat(key_lines[edit_line], cbd, sizeof(key_lines[edit_line]));
                                key_linepos += i;
                        }
                        Z_Free(cbd);

diff --git a/menu.c b/menu.c
index 919adb069426554bbf0d3576ba07be4d06152497..bbe8869983bad47ed676c53ddfc94180f8578397 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2656,8 +2656,8 @@ static void M_Keys_Draw (void)
                                if (keys[j] != -1)
                                {
                                        if (j > 0)
-                                               strcat(keystring, " or ");
-                                       strcat(keystring, Key_KeynumToString (keys[j]));
+                                               strlcat(keystring, " or ", sizeof(keystring));
+                                       strlcat(keystring, Key_KeynumToString (keys[j]), sizeof(keystring));
                                }
                        }
                }

diff --git a/model_brush.c b/model_brush.c
index c6caa6bdcdd699a88a94f98fdd0e4241cd5a47f7..210caf5e41e35122e0e32862c5c27dc399877d2b 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -1678,7 +1678,7 @@ static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data)
                                                        k = value[i];
                                                        value[i] = 0;
                                                        strcpy(wadname, "textures/");
-                                                       strcat(wadname, &value[j]);
+                                                       strlcat(wadname, &value[j], sizeof(wadname));
                                                        W_LoadTextureWadFile(wadname, false);
                                                        j = i+1;
                                                        if (!k)

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 657568e191dc2a95bbef91d2d6dc24366d3efb8c..cdba429feee6c17539b0d4b03d818ba9dba5f79b 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -317,7 +317,7 @@ void VM_M_findkeysforcommand(void)
        M_FindKeysForCommand(cmd, keys);
 
        for(i = 0; i < NUMKEYS; i++)
-               ret = strcat(ret, va(" \'%i\'", keys[i]));
+               strlcat(ret, va(" \'%i\'", keys[i]), VM_STRINGTEMP_LENGTH);
 
        PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(ret);
 }
@@ -427,19 +427,19 @@ void VM_M_setserverlistmaskstring( void )
 
        switch( field ) {
                case SLIF_CNAME:
-                       strncpy( mask->info.cname, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.cname) );
+                       strlcpy( mask->info.cname, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.cname) );
                        break;
                case SLIF_NAME:
-                       strncpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name)  );
+                       strlcpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name)  );
                        break;
                case SLIF_MAP:
-                       strncpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map)  );
+                       strlcpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map)  );
                        break;
                case SLIF_MOD:
-                       strncpy( mask->info.mod, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.mod)  );
+                       strlcpy( mask->info.mod, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.mod)  );
                        break;
                case SLIF_GAME:
-                       strncpy( mask->info.game, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.game)  );
+                       strlcpy( mask->info.game, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.game)  );
                        break;
                default:
                        VM_Warning( "VM_M_setserverlistmaskstring: Bad field number %i passed!\n", field );

diff --git a/prvm_cmds.c b/prvm_cmds.c
index f458102c6d39faf1ea085c443dd911781a055bbc..c644fa05bbc333533d2d7a59e57eabc82a075222 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -3621,17 +3621,13 @@ void VM_buf_implode (void)
                        l += strlen(b->strings[i]);
                        if(l>=4095)
                                break;
-                       k = strcat(k, b->strings[i]);
-                       if(!k)
-                               break;
+                       strlcat(k, b->strings[i], VM_STRINGTEMP_LENGTH);
                        if(sep && (i != b->num_strings-1))
                        {
                                l += strlen(sep);
                                if(l>=4095)
                                        break;
-                               k = strcat(k, sep);
-                               if(!k)
-                                       break;
+                               strlcat(k, sep, VM_STRINGTEMP_LENGTH);
                        }
                }
        PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(k);

diff --git a/prvm_edict.c b/prvm_edict.c
index 747e33c7a72abc70c1c3cf9b5c280b37ea7ccfd3..cde646451e834a7662545d69815da936cabf1289 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -607,10 +607,10 @@ void PRVM_ED_Print(prvm_edict_t *ed)
                        tempstring2[sizeof(tempstring2)-1] = 0;
                        name = tempstring2;
                }
-               strcat(tempstring, name);
+               strlcat(tempstring, name, sizeof(tempstring));
                for (l = strlen(name);l < 14;l++)
-                       strcat(tempstring, " ");
-               strcat(tempstring, " ");
+                       strlcat(tempstring, " ", sizeof(tempstring));
+               strlcat(tempstring, " ", sizeof(tempstring));
 
                name = PRVM_ValueString((etype_t)d->type, (prvm_eval_t *)v);
                if (strlen(name) > sizeof(tempstring2)-4)
@@ -620,8 +620,8 @@ void PRVM_ED_Print(prvm_edict_t *ed)
                        tempstring2[sizeof(tempstring2)-1] = 0;
                        name = tempstring2;
                }
-               strcat(tempstring, name);
-               strcat(tempstring, "\n");
+               strlcat(tempstring, name, sizeof(tempstring));
+               strlcat(tempstring, "\n", sizeof(tempstring));
                if (strlen(tempstring) >= sizeof(tempstring)/2)
                {
                        Con_Print(tempstring);
@@ -1616,32 +1616,32 @@ void PRVM_Fields_f (void)
                switch(d->type & ~DEF_SAVEGLOBAL)
                {
                case ev_string:
-                       strcat(tempstring, "string   ");
+                       strlcat(tempstring, "string   ", sizeof(tempstring));
                        break;
                case ev_entity:
-                       strcat(tempstring, "entity   ");
+                       strlcat(tempstring, "entity   ", sizeof(tempstring));
                        break;
                case ev_function:
-                       strcat(tempstring, "function ");
+                       strlcat(tempstring, "function ", sizeof(tempstring));
                        break;
                case ev_field:
-                       strcat(tempstring, "field    ");
+                       strlcat(tempstring, "field    ", sizeof(tempstring));
                        break;
                case ev_void:
-                       strcat(tempstring, "void     ");
+                       strlcat(tempstring, "void     ", sizeof(tempstring));
                        break;
                case ev_float:
-                       strcat(tempstring, "float    ");
+                       strlcat(tempstring, "float    ", sizeof(tempstring));
                        break;
                case ev_vector:
-                       strcat(tempstring, "vector   ");
+                       strlcat(tempstring, "vector   ", sizeof(tempstring));
                        break;
                case ev_pointer:
-                       strcat(tempstring, "pointer  ");
+                       strlcat(tempstring, "pointer  ", sizeof(tempstring));
                        break;
                default:
                        sprintf (tempstring2, "bad type %i ", d->type & ~DEF_SAVEGLOBAL);
-                       strcat(tempstring, tempstring2);
+                       strlcat(tempstring, tempstring2, sizeof(tempstring));
                        break;
                }
                if (strlen(name) > sizeof(tempstring2)-4)
@@ -1651,12 +1651,12 @@ void PRVM_Fields_f (void)
                        tempstring2[sizeof(tempstring2)-1] = 0;
                        name = tempstring2;
                }
-               strcat(tempstring, name);
+               strlcat(tempstring, name, sizeof(tempstring));
                for (j = (int)strlen(name);j < 25;j++)
-                       strcat(tempstring, " ");
+                       strlcat(tempstring, " ", sizeof(tempstring));
                sprintf(tempstring2, "%5d", counts[i]);
-               strcat(tempstring, tempstring2);
-               strcat(tempstring, "\n");
+               strlcat(tempstring, tempstring2, sizeof(tempstring));
+               strlcat(tempstring, "\n", sizeof(tempstring));
                if (strlen(tempstring) >= sizeof(tempstring)/2)
                {
                        Con_Print(tempstring);