From 428086190df50a0f437b2d5d22e19242338ad9cf Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 1 Mar 2011 15:22:05 +0000 Subject: [PATCH] Installed a test against non-zero msc1 on blank input drives --- libisoburn/trunk/libisoburn/burn_wrap.c | 10 ++++++++-- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libisoburn/trunk/libisoburn/burn_wrap.c b/libisoburn/trunk/libisoburn/burn_wrap.c index bcf3e658..7724bf09 100644 --- a/libisoburn/trunk/libisoburn/burn_wrap.c +++ b/libisoburn/trunk/libisoburn/burn_wrap.c @@ -1785,8 +1785,14 @@ not_found:; } else if(adr_mode==3) { o->fabricated_msc1= adr_num; s= isoburn_disc_get_status(d); - if((flag & 1) && o->fabricated_msc1 >= 16 - && (s == BURN_DISC_FULL || s == BURN_DISC_APPENDABLE)) { + if(o->fabricated_msc1 > 0 && s != BURN_DISC_FULL + && s != BURN_DISC_APPENDABLE) { + isoburn_msgs_submit(o, 0x00060000, + "Non-zero load offset given with blank input media", + 0, "FAILURE", 0); + ret= 0; goto ex; + } + if((flag & 1) && o->fabricated_msc1 >= 16) { /* adr_num is possibly 16 blocks too high */ ret= isoburn_read_iso_head(d, o->fabricated_msc1, &size,volid, 1|(1<<14)); if(ret==2) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index fb4006c7..cac1833d 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2011.03.01.145125" +#define Xorriso_timestamP "2011.03.01.152159"