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

Bug fix: A zero sized GPT partition was marked after the last appended

Browse Source 
GPT partition.
This commit is contained in:
Thomas Schmitt 2015-04-18 14:07:16 +02:00
parent c8776e605e
commit a0719328ea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libisofs/system_area.c
View File

@ -1567,6 +1567,7 @@ static int iso_write_gpt(Ecma119Image *t, uint32_t img_blocks, uint8_t *buf)
if (t->gpt_req_count == 0) if (t->gpt_req_count == 0)
return 2; return 2;
backup_end_lba = ((uint64_t) t->gpt_backup_end - t->gpt_backup_size) * 4;
/* Sort and fill gaps */ /* Sort and fill gaps */
qsort(t->gpt_req, t->gpt_req_count, qsort(t->gpt_req, t->gpt_req_count,
@ -1580,6 +1581,8 @@ static int iso_write_gpt(Ecma119Image *t, uint32_t img_blocks, uint8_t *buf)
goal = t->gpt_req[i]->start_block; goal = t->gpt_req[i]->start_block;
} else { } else {
goal = ((uint64_t) img_blocks) * 4; goal = ((uint64_t) img_blocks) * 4;
if (goal > backup_end_lba)
goal = backup_end_lba;
} }
if (i == 0) { if (i == 0) {
if (goal <= 16 * 4) if (goal <= 16 * 4)
@ -1627,8 +1630,6 @@ static int iso_write_gpt(Ecma119Image *t, uint32_t img_blocks, uint8_t *buf)
req = t->gpt_req[i]; req = t->gpt_req[i];
start_lba = req->start_block; start_lba = req->start_block;
end_lba = req->start_block + req->block_count; end_lba = req->start_block + req->block_count;
backup_end_lba = ((uint64_t) t->gpt_backup_end - t->gpt_backup_size) *
4;
if (req->start_block == t->opts->partition_offset * ((uint64_t) 4) && if (req->start_block == t->opts->partition_offset * ((uint64_t) 4) &&
req->block_count == ((uint64_t) 4) * 0xffffffff) req->block_count == ((uint64_t) 4) * 0xffffffff)
end_lba = t->vol_space_size * 4; end_lba = t->vol_space_size * 4;