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

client: Fix memory leaks

Browse source
This commit is contained in:
Denis Pauk 2024-08-27 01:19:26 +03:00
parent 33ebf6c193
commit b3efe338c1
3 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5712,10 +5712,18 @@ HasSkinsInDir(const char *dirname, int *num)
for (j = 0; j < num_png; j ++) for (j = 0; j < num_png; j ++)
{ {
if (list_png[j] && !strchr(list_png[j] + dirname_size, '/')) if (list_png[j])
{ {
*curr = list_png[j]; if (!strchr(list_png[j] + dirname_size, '/'))
curr++; {
*curr = list_png[j];
curr++;
}
else
{
/* unused in final response */
free(list_png[j]);
}
} }
} }
@ -5728,10 +5736,18 @@ HasSkinsInDir(const char *dirname, int *num)
for (j = 0; j < num_pcx; j ++) for (j = 0; j < num_pcx; j ++)
{ {
if (list_pcx[j] && !strchr(list_pcx[j] + dirname_size, '/')) if (list_pcx[j])
{ {
*curr = list_pcx[j]; if (!strchr(list_pcx[j] + dirname_size, '/'))
curr++; {
*curr = list_pcx[j];
curr++;
}
else
{
/* unused in final response */
free(list_pcx[j]);
}
} }
} }
@ -5744,10 +5760,18 @@ HasSkinsInDir(const char *dirname, int *num)
for (j = 0; j < num_m8; j ++) for (j = 0; j < num_m8; j ++)
{ {
if (list_m8[j] && !strchr(list_m8[j] + dirname_size, '/')) if (list_m8[j])
{ {
*curr = list_m8[j]; if (!strchr(list_m8[j] + dirname_size, '/'))
curr++; {
*curr = list_m8[j];
curr++;
}
else
{
/* unused in final response */
free(list_m8[j]);
}
} }
} }

6
src/common/filesystem.c
View file

@ -880,6 +880,12 @@ FS_LoadFile(const char *path, void **buffer)
if (size <= 0) if (size <= 0)
{ {
if (size == 0)
{
/* empty file, close before exit*/
FS_FCloseFile(f);
}
if (buffer) if (buffer)
{ {
*buffer = NULL; *buffer = NULL;

6
src/common/models.c
View file

@ -175,6 +175,12 @@ Mod_LoadFileMD5Merge(const char *namewe, void **buffer)
i, md5skinname); i, md5skinname);
} }
} }
/* clean up original buffer */
if (skins)
{
free(skins);
}
} }
/* prepare final file */ /* prepare final file */