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

Closed memory leaks with errors during ISO image import. Coverity CID 12572.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-10-09 20:07:29 +02:00
parent 7928c4ec3f
commit 48453ef1da
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libisofs/fs_image.c
View File

@ -5697,21 +5697,26 @@ int iso_image_import(IsoImage *image, IsoDataSource *src,
if (image->system_area_data != NULL) if (image->system_area_data != NULL)
free(image->system_area_data); free(image->system_area_data);
image->system_area_data = calloc(32768, 1); image->system_area_data = calloc(32768, 1);
if (image->system_area_data == NULL) if (image->system_area_data == NULL) {
iso_filesystem_unref(fs);
return ISO_OUT_OF_MEM; return ISO_OUT_OF_MEM;
}
image->system_area_options = 0; image->system_area_options = 0;
/* Read 32768 bytes */ /* Read 32768 bytes */
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
rpt = (uint8_t *) (image->system_area_data + i * 2048); rpt = (uint8_t *) (image->system_area_data + i * 2048);
ret = src->read_block(src, opts->block + i, rpt); ret = src->read_block(src, opts->block + i, rpt);
if (ret < 0) if (ret < 0) {
iso_filesystem_unref(fs);
return ret; return ret;
} }
} }
}
/* get root from filesystem */ /* get root from filesystem */
ret = fs->get_root(fs, &newroot); ret = fs->get_root(fs, &newroot);
if (ret < 0) { if (ret < 0) {
iso_filesystem_unref(fs);
return ret; return ret;
} }