cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-02-18 09:51:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed some botlib strcpy calls with overlapping buffers (UB as per the specs)

Browse source
This commit is contained in:
myT 2018-01-21 17:29:22 +01:00
parent 4a7f2356ab
commit 4fcf0f410e
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog.txt
View file

@ -10,6 +10,9 @@ chg: on Windows, a fatal error will move the early console window to the foregro
chg: com_hunkMegs doesn't have a maximum value anymore chg: com_hunkMegs doesn't have a maximum value anymore
a value too high would reset it and the engine might fail to load with the default value a value too high would reset it and the engine might fail to load with the default value
fix: strcpy calls with overlapping buffers (undefined behavior), which were responsible for the
"chars.h not found" / "couldn't load any skills" issue preventing bots from being added
fix: on Linux, the 'Z' and '9' keys could not be bound fix: on Linux, the 'Z' and '9' keys could not be bound
fix: cl_allowDownload 1 failing on "connect" (error 10047 on Windows) fix: cl_allowDownload 1 failing on "connect" (error 10047 on Windows)

2
code/botlib/l_precomp.cpp
View file

@ -863,7 +863,7 @@ void PC_ConvertPath(char *path)
if ((*ptr == '\\' || *ptr == '/') && if ((*ptr == '\\' || *ptr == '/') &&
(*(ptr+1) == '\\' || *(ptr+1) == '/')) (*(ptr+1) == '\\' || *(ptr+1) == '/'))
{ {
strcpy(ptr, ptr+1); memmove(ptr, ptr+1, strlen(ptr));
} //end if } //end if
else else
{ {

4
code/botlib/l_script.cpp
View file

@ -1109,7 +1109,7 @@ void StripDoubleQuotes(char *string)
{ {
if (*string == '\"') if (*string == '\"')
{ {
strcpy(string, string+1); memmove(string, string+1, strlen(string));
} //end if } //end if
string += strlen(string)-1; string += strlen(string)-1;
if (*string == '\"') if (*string == '\"')
@ -1125,7 +1125,7 @@ void StripSingleQuotes(char *string)
{ {
if (*string == '\'') if (*string == '\'')
{ {
strcpy(string, string+1); memmove(string, string+1, strlen(string));
} //end if } //end if
string += strlen(string)-1; string += strlen(string)-1;
if (*string == '\"') if (*string == '\"')