From 963d139093bc91be2798efd259840cf1eed72acf Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 24 Feb 2011 19:18:58 +0000 Subject: [PATCH] Corrected a flaw found by George Danchev with cpp --- libisoburn/isofs_wrap.c | 8 +++++--- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libisoburn/isofs_wrap.c b/libisoburn/isofs_wrap.c index 2c984f5f..ed0e2398 100644 --- a/libisoburn/isofs_wrap.c +++ b/libisoburn/isofs_wrap.c @@ -158,6 +158,8 @@ create_blank_image:; isoburn_report_iso_error(ret, "Cannot create image", 0, "FATAL", 0); return ret; } + iso_image_set_ignore_aclea(*image, + (!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) ); } else { /* Blank new image for the drive */ iso_image_unref(o->image); @@ -166,13 +168,13 @@ create_blank_image:; isoburn_report_iso_error(ret, "Cannot create image", 0, "FATAL", 0); return ret; } - if (image) { + if (image != NULL) { *image = o->image; iso_image_ref(*image); /*protects object from premature free*/ } - } - iso_image_set_ignore_aclea(*image, + iso_image_set_ignore_aclea(o->image, (!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) ); + } return 1; } diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index b77c15ed..b110715e 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2011.02.23.202632" +#define Xorriso_timestamP "2011.02.24.191908"