libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reacting properly on failure to set hppa or alpha boot image. Coverity CID 28828, 28829.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-11-06 20:03:54 +00:00
parent d5a73dbfcf
commit 4359102cdc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libisoburn/trunk/xorriso/opts_a_c.c
View File

@ -915,6 +915,8 @@ treatment_patch:;
strncpy(parm, treatpt + 5, parm_len); strncpy(parm, treatpt + 5, parm_len);
parm[parm_len]= 0; parm[parm_len]= 0;
ret= Xorriso_set_hppa_boot_parm(xorriso, eqpt + 1, parm, 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) { } else if(strncmp(treatpt, "alpha_boot=", 11) == 0) {
sprintf(eff_path, "-boot_image %s %s", formpt, treatpt); sprintf(eff_path, "-boot_image %s %s", formpt, treatpt);
@ -922,6 +924,8 @@ treatment_patch:;
if(ret <= 0) if(ret <= 0)
goto ex; goto ex;
ret = Xorriso_set_alpha_boot(xorriso, treatpt + 11, 0); ret = Xorriso_set_alpha_boot(xorriso, treatpt + 11, 0);
if(ret <= 0)
goto ex;
} else if(strncmp(treatpt, "boot_info_table=", 16)==0) { } else if(strncmp(treatpt, "boot_info_table=", 16)==0) {
if(strcmp(treatpt + 16, "off") == 0) if(strcmp(treatpt + 16, "off") == 0)

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.11.06.194638" #define Xorriso_timestamP "2015.11.06.200320"