diff options
| author | Brian C. Lane <bcl@redhat.com> | 2021-06-11 12:05:22 -0700 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2021-06-11 13:47:36 -0700 |
| commit | 86594612f8ae4dbc416e3cd1bc8bb05445df09e5 (patch) | |
| tree | 62d0e7b55f0ab08ef02a841eba1a031d547b6e82 | |
| parent | 6c4050af2c6c0abdbe1d553fdf2f19a6b600e9d1 (diff) | |
| download | parted-86594612f8ae4dbc416e3cd1bc8bb05445df09e5.tar.gz | |
libparted: Fix warning about buffer size in Atari label
When the Atari table is empty it copies 'PARTEDATARI' into the id, and
the start and size bytes. This can be confusion, so turn it into a
union of the string and the non-empty values.
| -rw-r--r-- | libparted/labels/atari.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libparted/labels/atari.c b/libparted/labels/atari.c index 7923487..2ac03d2 100644 --- a/libparted/labels/atari.c +++ b/libparted/labels/atari.c @@ -137,9 +137,14 @@ static AtariFS2PartId atr_fs2pid[] = { struct __attribute__ ((packed)) _AtariRawPartition { uint8_t flag; /* bit 0: active; bit 7: bootable */ - uint8_t id[3]; /* "GEM", "BGM", "XGM", ... */ - uint32_t start; /* start of partition */ - uint32_t size; /* length of partition */ + union { + uint8_t empty[11]; /* Empty table */ + struct __attribute__ ((packed)) { + uint8_t id[3]; /* "GEM", "BGM", "XGM", ... */ + uint32_t start; /* start of partition */ + uint32_t size; /* length of partition */ + }; + }; }; typedef struct _AtariRawPartition AtariRawPartition; @@ -241,8 +246,8 @@ static int atr_is_signature_entry (AtariRawPartition* part) { return part->flag == 0 - && !memcmp (part->id, SIGNATURE_EMPTY_TABLE, - SIGNATURE_EMPTY_SIZE ); + && !memcmp (part->empty, SIGNATURE_EMPTY_TABLE, + SIGNATURE_EMPTY_SIZE ); } /* Set Parted signature in an AHDI entry */ @@ -250,7 +255,7 @@ static void atr_put_signature_entry (AtariRawPartition* part) { part->flag = 0; - memcpy (part->id, SIGNATURE_EMPTY_TABLE, SIGNATURE_EMPTY_SIZE); + memcpy (part->empty, SIGNATURE_EMPTY_TABLE, SIGNATURE_EMPTY_SIZE); } #define atr_part_known(part, pid_list) (atr_pid_known ((part)->id, pid_list)) |