Corrected a flaw found by George Danchev with cpp

This commit is contained in:
Thomas Schmitt 2011-02-24 19:18:58 +00:00
parent 9af390fc51
commit d66f64b26a
2 changed files with 6 additions and 4 deletions

View File

@ -158,6 +158,8 @@ create_blank_image:;
isoburn_report_iso_error(ret, "Cannot create image", 0, "FATAL", 0); isoburn_report_iso_error(ret, "Cannot create image", 0, "FATAL", 0);
return ret; return ret;
} }
iso_image_set_ignore_aclea(*image,
(!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) );
} else { } else {
/* Blank new image for the drive */ /* Blank new image for the drive */
iso_image_unref(o->image); iso_image_unref(o->image);
@ -166,13 +168,13 @@ create_blank_image:;
isoburn_report_iso_error(ret, "Cannot create image", 0, "FATAL", 0); isoburn_report_iso_error(ret, "Cannot create image", 0, "FATAL", 0);
return ret; return ret;
} }
if (image) { if (image != NULL) {
*image = o->image; *image = o->image;
iso_image_ref(*image); /*protects object from premature free*/ iso_image_ref(*image); /*protects object from premature free*/
} }
} iso_image_set_ignore_aclea(o->image,
iso_image_set_ignore_aclea(*image,
(!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) ); (!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) );
}
return 1; return 1;
} }

View File

@ -1 +1 @@
#define Xorriso_timestamP "2011.02.23.202632" #define Xorriso_timestamP "2011.02.24.191908"