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

Bug fix: -boot_image "any" "system_area=/dev/zero" did not zeroize loaded data

Browse Source
This commit is contained in:
Thomas Schmitt 2015-12-23 11:18:38 +00:00
parent 0365cffbc5
commit a270ad22f9
7 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xorriso/base_obj.c
View File

@ -274,6 +274,7 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
m->boot_efi_default= 0; m->boot_efi_default= 0;
m->system_area_disk_path[0]= 0; m->system_area_disk_path[0]= 0;
m->system_area_clear_loaded= 0;
m->system_area_options= 0; m->system_area_options= 0;
m->patch_system_area= 0; m->patch_system_area= 0;
m->partition_offset= 0; m->partition_offset= 0;

2
xorriso/drive_mgt.c
View File

@ -471,6 +471,8 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, char *show_adr,
Xorriso_destroy_hln_array(xorriso, 0); Xorriso_destroy_hln_array(xorriso, 0);
Xorriso_destroy_di_array(xorriso, 0); Xorriso_destroy_di_array(xorriso, 0);
xorriso->boot_count= 0; xorriso->boot_count= 0;
xorriso->system_area_clear_loaded=
(strcmp(xorriso->system_area_disk_path, "/dev/zero") == 0);
/* check for invalid state */ /* check for invalid state */
if(state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE && if(state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE &&

2
xorriso/iso_img.c
View File

@ -113,6 +113,8 @@ int Xorriso_create_empty_iso(struct XorrisO *xorriso, int flag)
Xorriso_update_volid(xorriso, 0); Xorriso_update_volid(xorriso, 0);
xorriso->volset_change_pending= 0; xorriso->volset_change_pending= 0;
xorriso->boot_count= 0; xorriso->boot_count= 0;
xorriso->system_area_clear_loaded=
(strcmp(xorriso->system_area_disk_path, "/dev/zero") == 0);
xorriso->no_volset_present= 0; xorriso->no_volset_present= 0;
return(1); return(1);
} }

2
xorriso/opts_a_c.c
View File

@ -1006,6 +1006,8 @@ treatment_patch:;
if(ret <= 0) if(ret <= 0)
goto ex; goto ex;
xorriso->system_area_options&= ~0x4000; xorriso->system_area_options&= ~0x4000;
if(strcmp(treatpt + 12, "/dev/zero") == 0)
xorriso->system_area_clear_loaded= 1;
} else if(strncmp(treatpt, "partition_table=", 16)==0) { } else if(strncmp(treatpt, "partition_table=", 16)==0) {
if(strcmp(treatpt + 16, "off") == 0) { if(strcmp(treatpt + 16, "off") == 0) {

5
xorriso/write_run.c
View File

@ -440,7 +440,10 @@ int Xorriso_set_system_area(struct XorrisO *xorriso, struct burn_drive *drive,
Xorriso_alloc_meM(buf, char, 32768); Xorriso_alloc_meM(buf, char, 32768);
memset(buf, 0, 32768); memset(buf, 0, 32768);
system_area_options= xorriso->system_area_options; system_area_options= xorriso->system_area_options;
sa_loaded= iso_image_get_system_area(img, buf, &options, 0); if(xorriso->system_area_clear_loaded)
sa_loaded= 0;
else
sa_loaded= iso_image_get_system_area(img, buf, &options, 0);
if(sa_loaded < 0) { if(sa_loaded < 0) {
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
Xorriso_report_iso_error(xorriso, "", sa_loaded, Xorriso_report_iso_error(xorriso, "", sa_loaded,

1
xorriso/xorriso_private.h
View File

@ -411,6 +411,7 @@ struct XorrisO { /* the global context of xorriso */
1= appy --efi-boot parameters when attaching to img */ 1= appy --efi-boot parameters when attaching to img */
char system_area_disk_path[SfileadrL]; char system_area_disk_path[SfileadrL];
int system_area_clear_loaded;
int system_area_options; /* bit0= "GRUB protective msdos label" int system_area_options; /* bit0= "GRUB protective msdos label"
(a simple partition table) (a simple partition table)
bit1= isohybrid boot image pointer bit1= isohybrid boot image pointer

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.12.22.133736" #define Xorriso_timestamP "2015.12.23.112013"