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

Bug fix: GPT production did not yield proper results with appended sessions

Browse Source 
resp. with TOC emulation enabled.
This commit is contained in:
Thomas Schmitt 2015-04-25 12:13:11 +02:00
parent d4b8cbe474
commit 5f6e64b792
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libisofs/system_area.c
View File

@ -1768,7 +1768,7 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
return ISO_NON_MBR_SYS_AREA; return ISO_NON_MBR_SYS_AREA;
if (t->gpt_backup_outside) if (t->gpt_backup_outside)
gpt_blocks = t->total_size / 2048; gpt_blocks = t->total_size / BLOCK_SIZE + t->opts->ms_block;
else else
gpt_blocks = img_blocks; gpt_blocks = img_blocks;
ret = iso_write_gpt(t, gpt_blocks, buf); ret = iso_write_gpt(t, gpt_blocks, buf);
@ -1879,7 +1879,7 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
*/ */
img_blocks = t->curblock; /* value might be altered */ img_blocks = t->curblock; /* value might be altered */
if (part_type == 0xee) { if (part_type == 0xee) {
mbrp1_blocks = t->total_size / 2048; mbrp1_blocks = t->total_size / BLOCK_SIZE + t->opts->ms_block;
offset_flag |= 2 | 1; /* protective MBR, no other partitions */ offset_flag |= 2 | 1; /* protective MBR, no other partitions */
} else { } else {
mbrp1_blocks = img_blocks; mbrp1_blocks = img_blocks;
@ -2448,7 +2448,7 @@ int gpt_tail_writer_compute_data_blocks(IsoImageWriter *writer)
if (t->gpt_backup_outside) { if (t->gpt_backup_outside) {
t->total_size += t->gpt_backup_size * 2048; t->total_size += t->gpt_backup_size * 2048;
/* The ISO block number after the backup GPT header */ /* The ISO block number after the backup GPT header */
t->gpt_backup_end = t->total_size / 2048; t->gpt_backup_end = t->total_size / BLOCK_SIZE + t->opts->ms_block;
} else { } else {
t->curblock += t->gpt_backup_size; t->curblock += t->gpt_backup_size;
/* The ISO block number after the backup GPT header */ /* The ISO block number after the backup GPT header */