vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Increases xfs.mod by 24 bytes (but decreases by 115 compressed when
	compressed).
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-20 16:17:41 +02:00
parent 156e4ea071
commit 97ec2d71d0
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-10-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/nilfs2.c: Remove variable length arrays.
Increases xfs.mod by 24 bytes (but decreases by 115 compressed when
compressed).
2013-10-20 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/xfs.c: Remove variable length arrays. * grub-core/fs/xfs.c: Remove variable length arrays.

22
grub-core/fs/nilfs2.c
View file

@ -136,6 +136,7 @@ struct grub_nilfs2_dir_entry
{ {
grub_uint64_t inode; grub_uint64_t inode;
grub_uint16_t rec_len; grub_uint16_t rec_len;
#define MAX_NAMELEN 255
grub_uint8_t name_len; grub_uint8_t name_len;
grub_uint8_t file_type; grub_uint8_t file_type;
#if 0 /* followed by file name. */ #if 0 /* followed by file name. */
@ -505,9 +506,13 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data,
grub_uint64_t key, int need_translate) grub_uint64_t key, int need_translate)
{ {
struct grub_nilfs2_btree_node *node; struct grub_nilfs2_btree_node *node;
GRUB_PROPERLY_ALIGNED_ARRAY (block, NILFS2_BLOCK_SIZE (data)); void *block;
grub_uint64_t ptr; grub_uint64_t ptr;
int level, found, index; int level, found = 0, index;
block = grub_malloc (NILFS2_BLOCK_SIZE (data));
if (!block)
return -1;
node = grub_nilfs2_btree_get_root (inode); node = grub_nilfs2_btree_get_root (inode);
level = grub_nilfs2_btree_get_level (node); level = grub_nilfs2_btree_get_level (node);
@ -522,14 +527,14 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data,
grub_nilfs2_btree_get_nonroot_node (data, ptr, block); grub_nilfs2_btree_get_nonroot_node (data, ptr, block);
if (grub_errno) if (grub_errno)
{ {
return -1; goto fail;
} }
node = (struct grub_nilfs2_btree_node *) block; node = (struct grub_nilfs2_btree_node *) block;
if (node->bn_level != level) if (node->bn_level != level)
{ {
grub_error (GRUB_ERR_BAD_FS, "btree level mismatch\n"); grub_error (GRUB_ERR_BAD_FS, "btree level mismatch\n");
return -1; goto fail;
} }
if (!found) if (!found)
@ -546,14 +551,19 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data,
else else
{ {
grub_error (GRUB_ERR_BAD_FS, "btree corruption\n"); grub_error (GRUB_ERR_BAD_FS, "btree corruption\n");
return -1; goto fail;
} }
} }
grub_free (block);
if (!found) if (!found)
return -1; return -1;
return ptr; return ptr;
fail:
grub_free (block);
return -1;
} }
static inline grub_uint64_t static inline grub_uint64_t
@ -896,7 +906,7 @@ grub_nilfs2_iterate_dir (grub_fshelp_node_t dir,
if (dirent.name_len != 0) if (dirent.name_len != 0)
{ {
char filename[dirent.name_len + 1]; char filename[MAX_NAMELEN + 1];
struct grub_fshelp_node *fdiro; struct grub_fshelp_node *fdiro;
enum grub_fshelp_filetype type = GRUB_FSHELP_UNKNOWN; enum grub_fshelp_filetype type = GRUB_FSHELP_UNKNOWN;