From ea5edc7f2f4bcd74b82bda43529a5d7aa9ea3762 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 8 Nov 2015 11:03:41 +0000 Subject: [PATCH] Clarified handling of missing drives when it shall be given up. Coverity CID 28697. --- libisoburn/trunk/xorriso/drive_mgt.c | 6 +++--- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libisoburn/trunk/xorriso/drive_mgt.c b/libisoburn/trunk/xorriso/drive_mgt.c index be2c32a3..2c48bae8 100644 --- a/libisoburn/trunk/xorriso/drive_mgt.c +++ b/libisoburn/trunk/xorriso/drive_mgt.c @@ -755,9 +755,9 @@ int Xorriso_give_up_drive(struct XorrisO *xorriso, int flag) Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); do_eject= 0; } - Xorriso_get_drive_handles(xorriso, &dinfo, &drive, - "on attempt to give up drive", 2); - if(!in_is_out_too) { + ret= Xorriso_get_drive_handles(xorriso, &dinfo, &drive, + "on attempt to give up drive", 2); + if(ret >= 0 && !in_is_out_too) { if(drive!=NULL) isoburn_drive_release(drive, do_eject); if(dinfo!=NULL) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index f00fb18a..6417d182 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2015.11.07.111034" +#define Xorriso_timestamP "2015.11.08.110314"