* grub-core/fs/hfs.c: Remove variable length arrays.

	Reduces hfs.mod by 8 bytes (52 compressed).

diff --git a/ChangeLog b/ChangeLog
index 8e68fc451510b5b7f7455386c39a8bf443300514..659096fd39a4d20a4e4ae52515d2ee63efe81231 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/hfs.c: Remove variable length arrays.
+       Reduces hfs.mod by 8 bytes (52 compressed).
+
 2013-10-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/udf.c: Remove variable length arrays.

diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
index 14520c0a9807ca7945fbb7d0a2e1e34892bf86b9..25414a5c5ba787f3205082b46be074064f5e44c2 100644 (file)
--- a/grub-core/fs/hfs.c
+++ b/grub-core/fs/hfs.c
@@ -665,14 +665,21 @@ grub_hfs_iterate_records (struct grub_hfs_data *data, int type, int idx,
                                                      void *hook_arg),
                          void *hook_arg)
 {
-  int nodesize = type == 0 ? data->cat_size : data->ext_size;
+  grub_size_t nodesize = type == 0 ? data->cat_size : data->ext_size;
 
-  union
+  union node_union
   {
     struct grub_hfs_node node;
-    char rawnode[nodesize];
-    grub_uint16_t offsets[nodesize / 2];
-  } node;
+    char rawnode[0];
+    grub_uint16_t offsets[0];
+  } *node;
+
+  if (nodesize < sizeof (struct grub_hfs_node))
+    nodesize = sizeof (struct grub_hfs_node);
+
+  node = grub_malloc (nodesize);
+  if (!node)
+    return grub_errno;
 
   do
     {
@@ -689,15 +696,16 @@ grub_hfs_iterate_records (struct grub_hfs_data *data, int type, int idx,
                             (type == 0) ? GRUB_HFS_CNID_CAT : GRUB_HFS_CNID_EXT,
                            idx / (data->blksz / nodesize), 0);
       blk += (idx % (data->blksz / nodesize));
-      if (grub_errno)
-       return grub_errno;
 
-      if (grub_disk_read (data->disk, blk, 0,
-                         sizeof (node), &node))
-       return grub_errno;
+      if (grub_errno || grub_disk_read (data->disk, blk, 0,
+                                       nodesize, node))
+       {
+         grub_free (node);
+         return grub_errno;
+       }
 
       /* Iterate over all records in this node.  */
-      for (i = 0; i < grub_be_to_cpu16 (node.node.reccnt); i++)
+      for (i = 0; i < grub_be_to_cpu16 (node->node.reccnt); i++)
        {
          int pos = (nodesize >> 1) - 1 - i;
          struct pointer
@@ -705,25 +713,28 @@ grub_hfs_iterate_records (struct grub_hfs_data *data, int type, int idx,
            grub_uint8_t keylen;
            grub_uint8_t key;
          } __attribute__ ((packed)) *pnt;
-         pnt = (struct pointer *) (grub_be_to_cpu16 (node.offsets[pos])
-                                   + node.rawnode);
+         pnt = (struct pointer *) (grub_be_to_cpu16 (node->offsets[pos])
+                                   + node->rawnode);
 
          struct grub_hfs_record rec =
            {
              &pnt->key,
              pnt->keylen,
              &pnt->key + pnt->keylen +(pnt->keylen + 1) % 2,
-             nodesize - grub_be_to_cpu16 (node.offsets[pos])
+             nodesize - grub_be_to_cpu16 (node->offsets[pos])
              - pnt->keylen - 1
            };
 
-         if (node_hook (&node.node, &rec, hook_arg))
-           return 0;
+         if (node_hook (&node->node, &rec, hook_arg))
+           {
+             grub_free (node);
+             return 0;
+           }
        }
 
-      idx = grub_be_to_cpu32 (node.node.next);
+      idx = grub_be_to_cpu32 (node->node.next);
     } while (idx && this);
-
+  grub_free (node);
   return 0;
 }