andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing gcc warning by a slightly safer construct.

Browse Source 
Previously, strncopy length in parser was determined by input string. Now we added an explicit maximum.
This commit is contained in:
Cas Cremers 2020-10-28 15:14:16 +01:00
parent 088bdd3cfd
commit d3203ba55c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scanner.l
View File

@ -49,6 +49,7 @@ struct stringlist {
typedef struct stringlist* Stringlist; typedef struct stringlist* Stringlist;
static Stringlist allocatedStrings = NULL; static Stringlist allocatedStrings = NULL;
static int MAXNAMELENGTH = 4096;
int mylineno = 0; int mylineno = 0;
@ -226,6 +227,7 @@ Symbol mkstring(char *name)
char* s; char* s;
Stringlist sl; Stringlist sl;
int len; int len;
int buflen;
if (( t = lookup(name)) != NULL) if (( t = lookup(name)) != NULL)
{ {
@ -233,9 +235,15 @@ Symbol mkstring(char *name)
} }
// make new name // make new name
len = strlen(name); len = strlen(name);
s = (char *)malloc(len+1); if (len >= MAXNAMELENGTH)
{
// The buffer length MAXNAMELENGTH is somewhat arbitrary, and feel free to change the constant, but it prevents oddly large memory allocations.
error ("The maximum name length is %i, but found %i characters for [%s]", MAXNAMELENGTH, len, name );
}
buflen = len;
s = (char *)malloc(buflen+1);
sl = (Stringlist) malloc(sizeof(struct stringlist)); sl = (Stringlist) malloc(sizeof(struct stringlist));
strncpy(s,name,len); strncpy(s,name,buflen);
sl->next = allocatedStrings; sl->next = allocatedStrings;
allocatedStrings = sl; allocatedStrings = sl;
sl->string = s; sl->string = s;