libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Fix some more memory leaks

Browse Source
This commit is contained in:
twinaphex 2017-09-21 23:38:29 +02:00
parent 1a77c383b9
commit 50d48139a3
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tasks/task_database.c
View File

@ -97,13 +97,14 @@ static intfstream_t* intfstream_open_file(const char *path)
return NULL;
if (!intfstream_open(fd, path, RFILE_MODE_READ, -1))
{
intfstream_close(fd);
free(fd);
return NULL;
}
goto error;
return fd;
error:
intfstream_close(fd);
free(fd);
return NULL;
}
static intfstream_t *open_memory(void *data, size_t size)
@ -122,12 +123,14 @@ static intfstream_t *open_memory(void *data, size_t size)
return NULL;
if (!intfstream_open(fd, NULL, RFILE_MODE_READ, -1))
{
intfstream_close(fd);
return NULL;
}
goto error;
return fd;
error:
intfstream_close(fd);
free(fd);
return NULL;
}
static intfstream_t*
@ -145,12 +148,14 @@ open_chd_track(const char *path, int32_t track)
return NULL;
if (!intfstream_open(fd, path, RFILE_MODE_READ, -1))
{
intfstream_close(fd);
return NULL;
}
goto error;
return fd;
error:
intfstream_close(fd);
free(fd);
return NULL;
}
static void database_info_set_type(
@ -277,11 +282,7 @@ static bool intfstream_file_get_serial(const char *name, size_t offset, size_t s
intfstream_seek(fd, 0, SEEK_SET);
if (file_size < 0)
{
intfstream_close(fd);
free(fd);
return 0;
}
goto error;
if (offset != 0 || size < (size_t) file_size)
{
@ -289,10 +290,8 @@ static bool intfstream_file_get_serial(const char *name, size_t offset, size_t s
intfstream_seek(fd, offset, SEEK_SET);
if (intfstream_read(fd, data, size) != (ssize_t) size)
{
intfstream_close(fd);
free(fd);
free(data);
return 0;
goto error;
}
intfstream_close(fd);
@ -310,6 +309,11 @@ static bool intfstream_file_get_serial(const char *name, size_t offset, size_t s
free(data);
free(fd);
return rv;
error:
intfstream_close(fd);
free(fd);
return 0;
}
static int task_database_cue_get_serial(const char *name, char* serial)

3
tasks/task_database_cue.c
View File

@ -542,7 +542,10 @@ error:
free(tmp_token);
free(last_file);
if (fd)
{
intfstream_close(fd);
free(fd);
}
return -errno;
}