mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix plethora of memory leaks again

Browse Source
This commit is contained in:
twinaphex 2017-09-21 21:33:13 +02:00
parent 0f80e31382
commit 1a77c383b9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasks/task_database.c
View File

@ -279,6 +279,7 @@ static bool intfstream_file_get_serial(const char *name, size_t offset, size_t s
if (file_size < 0) if (file_size < 0)
{ {
intfstream_close(fd); intfstream_close(fd);
free(fd);
return 0; return 0;
} }
@ -289,11 +290,13 @@ static bool intfstream_file_get_serial(const char *name, size_t offset, size_t s
if (intfstream_read(fd, data, size) != (ssize_t) size) if (intfstream_read(fd, data, size) != (ssize_t) size)
{ {
intfstream_close(fd); intfstream_close(fd);
free(fd);
free(data); free(data);
return 0; return 0;
} }
intfstream_close(fd); intfstream_close(fd);
free(fd);
fd = open_memory(data, size); fd = open_memory(data, size);
if (!fd) if (!fd)
{ {
@ -376,6 +379,7 @@ static int task_database_chd_get_serial(const char *name, char* serial)
result = intfstream_get_serial(fd, serial); result = intfstream_get_serial(fd, serial);
intfstream_close(fd); intfstream_close(fd);
free(fd);
return result; return result;
} }
@ -414,6 +418,7 @@ static bool intfstream_file_get_crc(const char *name,
if (file_size < 0) if (file_size < 0)
{ {
intfstream_close(fd); intfstream_close(fd);
free(fd);
return 0; return 0;
} }
@ -423,16 +428,18 @@ static bool intfstream_file_get_crc(const char *name,
intfstream_seek(fd, offset, SEEK_SET); intfstream_seek(fd, offset, SEEK_SET);
if (intfstream_read(fd, data, size) != (ssize_t) size) if (intfstream_read(fd, data, size) != (ssize_t) size)
{ {
intfstream_close(fd); intfstream_close(fd);
free(fd);
free(data); free(data);
return 0; return 0;
} }
intfstream_close(fd); intfstream_close(fd);
free(fd);
fd = open_memory(data, size); fd = open_memory(data, size);
if (!fd) if (!fd)
{ {
free(data); free(data);
return 0; return 0;
} }
@ -522,6 +529,7 @@ static bool task_database_chd_get_crc(const char *name, uint32_t *crc)
RARCH_LOG("CHD '%s' crc: %x\n", name, *crc); RARCH_LOG("CHD '%s' crc: %x\n", name, *crc);
} }
intfstream_close(fd); intfstream_close(fd);
free(fd);
return rv; return rv;
} }
@ -550,6 +558,8 @@ static void task_database_cue_prune(database_info_handle_t *db,
} }
end: end:
if (fd)
free(fd);
free(path); free(path);
} }