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

Prevented writing of undesired bytes in make_sun_disk_label() (commit b0230b6)

This commit is contained in:
Thomas Schmitt 2020-11-14 09:24:11 +01:00
parent 92af0c9752
commit 29cc5c8d31
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libisofs/system_area.c
View File

@ -789,18 +789,21 @@ static int write_sun_partition_entry(int partition_number,
*/ */
static int make_sun_disk_label(Ecma119Image *t, uint8_t *buf, int flag) static int make_sun_disk_label(Ecma119Image *t, uint8_t *buf, int flag)
{ {
int ret, i; int ret, i, l;
uint64_t blk; uint64_t blk;
/* Bytes 512 to 32767 may come from image or external file */ /* Bytes 512 to 32767 may come from image or external file */
memset(buf, 0, 512); memset(buf, 0, 512);
/* 0 - 127 | label | ASCII Label */ /* 0 - 127 | label | ASCII Label */
if (t->opts->ascii_disc_label[0]) if (t->opts->ascii_disc_label[0]) {
memcpy((char *) buf, t->opts->ascii_disc_label, 128); for (l = 0; l < 128 && t->opts->ascii_disc_label[l] != 0; l++);
else if (l > 0)
memcpy((char *) buf, t->opts->ascii_disc_label, l);
} else {
strcpy((char *) buf, strcpy((char *) buf,
"CD-ROM Disc with Sun sparc boot created by libisofs"); "CD-ROM Disc with Sun sparc boot created by libisofs");
}
/* 128 - 131 | 1 | Layout version */ /* 128 - 131 | 1 | Layout version */
iso_msb(buf + 128, 1, 4); iso_msb(buf + 128, 1, 4);