libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed double free in case of error while looking up path in loaded ISO image.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-10-12 10:56:42 +02:00
parent c6aedc9eb5
commit 05d0ee4a37
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libisofs/fs_image.c
View File

@ -2183,7 +2183,7 @@ static
int ifs_get_by_path(IsoFilesystem *fs, const char *path, IsoFileSource **file) int ifs_get_by_path(IsoFilesystem *fs, const char *path, IsoFileSource **file)
{ {
int ret; int ret;
IsoFileSource *src; IsoFileSource *src = NULL;
char *ptr, *brk_info, *component; char *ptr, *brk_info, *component;
if (fs == NULL || fs->data == NULL || path == NULL || file == NULL) { if (fs == NULL || fs->data == NULL || path == NULL || file == NULL) {
@ -2232,6 +2232,7 @@ int ifs_get_by_path(IsoFilesystem *fs, const char *path, IsoFileSource **file)
ret = ifs_get_file(src, component, &child); ret = ifs_get_file(src, component, &child);
iso_file_source_unref(src); iso_file_source_unref(src);
src = NULL;
if (ret <= 0) { if (ret <= 0) {
break; break;
} }
@ -2242,7 +2243,8 @@ int ifs_get_by_path(IsoFilesystem *fs, const char *path, IsoFileSource **file)
free(ptr); free(ptr);
if (ret < 0) { if (ret < 0) {
iso_file_source_unref(src); if (src != NULL)
iso_file_source_unref(src);
} else if (ret == 0) { } else if (ret == 0) {
ret = ISO_FILE_DOESNT_EXIST; ret = ISO_FILE_DOESNT_EXIST;
} else { } else {