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

Prevented a SIGSEGV with isoburn_read_image() feature to submit NULL parameter. Coverity CID 28721.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-11-09 13:31:59 +00:00
parent 06f5016114
commit 9a5cd3f4f0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libisoburn/trunk/libisoburn/isofs_wrap.c
View File

@ -151,6 +151,7 @@ int isoburn_read_image(struct burn_drive *d,
enum burn_disc_status status= BURN_DISC_BLANK; enum burn_disc_status status= BURN_DISC_BLANK;
IsoDataSource *ds= NULL; IsoDataSource *ds= NULL;
struct isoburn *o= NULL; struct isoburn *o= NULL;
IsoImage *new_image= NULL;
msg= calloc(1, 160); msg= calloc(1, 160);
@ -189,6 +190,7 @@ create_blank_image:;
} }
iso_image_set_ignore_aclea(*image, iso_image_set_ignore_aclea(*image,
(!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) ); (!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) );
new_image= *image;
} else { } else {
/* Blank new image for the drive */ /* Blank new image for the drive */
iso_image_unref(o->image); iso_image_unref(o->image);
@ -207,8 +209,9 @@ create_blank_image:;
ret= isoburn_root_defaults(o->image, 0); ret= isoburn_root_defaults(o->image, 0);
if(ret <= 0) if(ret <= 0)
goto ex; goto ex;
new_image= o->image;
} }
ret= iso_image_set_truncate_mode(*image, read_opts->truncate_mode, ret= iso_image_set_truncate_mode(new_image, read_opts->truncate_mode,
read_opts->truncate_length); read_opts->truncate_length);
if(ret < 0) if(ret < 0)
goto ex; goto ex;

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.11.09.121421" #define Xorriso_timestamP "2015.11.09.133135"