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

Bug fix: When reading an ISO filesystem, the presence of 

system area options flag bit0 (-protective-msdos-label)
         was not recognized if a partition is appended.
This commit is contained in:
Thomas Schmitt 2015-12-22 12:25:50 +01:00
parent c79299ba08
commit 009ce1be8f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libisofs/fs_image.c
View File

@ -3967,20 +3967,21 @@ int iso_analyze_mbr(IsoImage *image, IsoDataSource *src, int flag)
is_grub2_mbr = 1; is_grub2_mbr = 1;
} }
if (sai->mbr_req_count == 1 && !is_isohybrid) { if (sai->mbr_req_count >= 1 && !is_isohybrid) {
part = sai->mbr_req[0]; part = sai->mbr_req[0];
if (part->start_block == 1 && if (part->start_block == 1 &&
part->block_count + 1 == ((uint64_t) sai->image_size) * 4) { part->block_count + 1 == ((uint64_t) sai->image_size) * 4) {
/* libisofs protective msdos label for GRUB2 */ /* libisofs protective msdos label for GRUB2 */
is_protective_label = 1; is_protective_label = 1;
sub_type = 0; sub_type = 0;
} else if (part->start_block == 0 && } else if (sai->mbr_req_count == 1 && part->start_block == 0 &&
part->block_count <= ((uint64_t) sai->image_size) * 4 && part->block_count <= ((uint64_t) sai->image_size) * 4 &&
part->block_count + 600 >= ((uint64_t) sai->image_size) * 4 && part->block_count + 600 >= ((uint64_t) sai->image_size) * 4 &&
part->type_byte == 0x96) { part->type_byte == 0x96) {
/* CHRP (possibly without padding) */ /* CHRP (possibly without padding) */
sub_type = 1; sub_type = 1;
} else if (sai->mbr_req[0]->start_block > 0 && } else if (sai->mbr_req_count == 1 &&
sai->mbr_req[0]->start_block > 0 &&
(sai->mbr_req[0]->start_block % 4) == 0 && (sai->mbr_req[0]->start_block % 4) == 0 &&
(sai->mbr_req[0]->start_block + (sai->mbr_req[0]->start_block +
sai->mbr_req[0]->block_count) / 4 <= sai->image_size && sai->mbr_req[0]->block_count) / 4 <= sai->image_size &&