[parted-devel] [PATCH 6/7] libparted: Fix warning about buffer size in Atari label

[Brian C. Lane]

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.
---
 libparted/labels/atari.c | 17 +++++++++++------
 1 file 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))
-- 
2.31.1