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

Bug fix of previous revision 653:

Browse Source 
SIGSEGV because of dereferencing NULL when writing without boot image.
This commit is contained in:
Thomas Schmitt 2010-04-22 23:13:54 +02:00
parent 59d143c1f0
commit ace0d1ab2e
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libisofs/ecma119.c
View File

@ -1167,15 +1167,20 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
/* el-torito? */ /* el-torito? */
target->eltorito = (src->bootcat == NULL ? 0 : 1); target->eltorito = (src->bootcat == NULL ? 0 : 1);
target->catalog = src->bootcat; target->catalog = src->bootcat;
target->num_bootsrc = target->catalog->num_bootimages; if (target->catalog != NULL) {
target->bootsrc = calloc(target->num_bootsrc + 1, target->num_bootsrc = target->catalog->num_bootimages;
sizeof(IsoFileSrc *)); target->bootsrc = calloc(target->num_bootsrc + 1,
if (target->bootsrc == NULL) { sizeof(IsoFileSrc *));
ret = ISO_OUT_OF_MEM; if (target->bootsrc == NULL) {
goto target_cleanup; ret = ISO_OUT_OF_MEM;
goto target_cleanup;
}
for (i= 0; i < target->num_bootsrc; i++)
target->bootsrc[i] = NULL;
} else {
target->num_bootsrc = 0;
target->bootsrc = NULL;
} }
for (i= 0; i < target->num_bootsrc; i++)
target->bootsrc[i] = NULL;
if (opts->system_area_data != NULL) { if (opts->system_area_data != NULL) {
system_area = opts->system_area_data; system_area = opts->system_area_data;