From 4359102cdc30dd82f138b81540f9e73e8b2d4701 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 6 Nov 2015 20:03:54 +0000 Subject: [PATCH] Reacting properly on failure to set hppa or alpha boot image. Coverity CID 28828, 28829. --- libisoburn/trunk/xorriso/opts_a_c.c | 4 ++++ libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libisoburn/trunk/xorriso/opts_a_c.c b/libisoburn/trunk/xorriso/opts_a_c.c index 16d5af1c..54cf04b7 100644 --- a/libisoburn/trunk/xorriso/opts_a_c.c +++ b/libisoburn/trunk/xorriso/opts_a_c.c @@ -915,6 +915,8 @@ treatment_patch:; strncpy(parm, treatpt + 5, parm_len); parm[parm_len]= 0; ret= Xorriso_set_hppa_boot_parm(xorriso, eqpt + 1, parm, 0); + if(ret <= 0) + goto ex; } else if(strncmp(treatpt, "alpha_boot=", 11) == 0) { sprintf(eff_path, "-boot_image %s %s", formpt, treatpt); @@ -922,6 +924,8 @@ treatment_patch:; if(ret <= 0) goto ex; ret = Xorriso_set_alpha_boot(xorriso, treatpt + 11, 0); + if(ret <= 0) + goto ex; } else if(strncmp(treatpt, "boot_info_table=", 16)==0) { if(strcmp(treatpt + 16, "off") == 0) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 6c67b80a..0f8e528f 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2015.11.06.194638" +#define Xorriso_timestamP "2015.11.06.200320"