yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 15:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check for null and free correct number of directories

Browse source 
Potential errors.
This commit is contained in:
apartfromtime 2022-08-21 11:31:09 +10:00
parent 243d4193ee
commit 45f4e1860c
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/client/menu/menu.c
View file

@ -5228,6 +5228,7 @@ PlayerDirectoryList(void)
char* findname = "players/*";
char** list = 0;
int num = 0;
int n = 0;
// get a list of "players" subdirectories
if ((list = FS_ListFiles2(findname, &num, 0, 0)) == 0)
@ -5235,14 +5236,16 @@ PlayerDirectoryList(void)
return false;
}
if (num > MAX_PLAYERMODELS)
n = num;
if (n > MAX_PLAYERMODELS)
{
num = MAX_PLAYERMODELS;
n = MAX_PLAYERMODELS - 1;
}
s_directory.num = 0;
for (int i = 0; i < num; ++i)
for (int i = 0; i < n; ++i)
{
// last element of FS_FileList maybe null
if (list[i] == 0)
@ -5261,7 +5264,7 @@ PlayerDirectoryList(void)
s_directory.data = data;
s_directory.num = 0;
for (int i = 0; i < num; ++i)
for (int i = 0; i < n; ++i)
{
// last element of FS_FileList maybe null
if (list[i] == 0)
@ -5316,6 +5319,11 @@ PlayerModelList(void)
// verify the existence of at least one pcx skin
for (int i = 0; i < s_directory.num; ++i)
{
if (s_directory.data[i] == 0)
{
continue;
}
strcpy(findname, s_directory.data[i]);
strcat(findname, "/*.pcx");