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

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

Browse source 
Increases iso9660.mod by 200 bytes (but decreases by 79 compressed when
	compressed).
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-20 16:21:02 +02:00
parent 97ec2d71d0
commit 9c12ac9773
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

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

7
grub-core/fs/iso9660.c
View file

@ -79,6 +79,7 @@ struct grub_iso9660_dir
struct grub_iso9660_date2 mtime; struct grub_iso9660_date2 mtime;
grub_uint8_t flags; grub_uint8_t flags;
grub_uint8_t unused2[6]; grub_uint8_t unused2[6];
#define MAX_NAMELEN 255
grub_uint8_t namelen; grub_uint8_t namelen;
} __attribute__ ((packed)); } __attribute__ ((packed));
@ -328,11 +329,11 @@ grub_iso9660_convert_string (grub_uint8_t *us, int len)
{ {
char *p; char *p;
int i; int i;
grub_uint16_t t[len]; grub_uint16_t t[MAX_NAMELEN / 2 + 1];
p = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1); p = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1);
if (! p) if (! p)
return p; return NULL;
for (i=0; i<len; i++) for (i=0; i<len; i++)
t[i] = grub_be_to_cpu16 (grub_get_unaligned16 (us + 2 * i)); t[i] = grub_be_to_cpu16 (grub_get_unaligned16 (us + 2 * i));
@ -680,7 +681,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
} }
{ {
char name[dirent.namelen + 1]; char name[MAX_NAMELEN + 1];
int nameoffset = offset + sizeof (dirent); int nameoffset = offset + sizeof (dirent);
struct grub_fshelp_node *node; struct grub_fshelp_node *node;
int sua_off = (sizeof (dirent) + dirent.namelen + 1 int sua_off = (sizeof (dirent) + dirent.namelen + 1