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

* grub-core/fs/udf.c (read_string): Bail out on size=0.

Browse source 
(grub_udf_read_symlink): Handle read_string failure.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-13 20:18:33 +02:00
parent 5eae317511
commit def3df7520
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/udf.c (read_string): Bail out on size=0.
(grub_udf_read_symlink): Handle read_string failure.
2012-05-12 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/emu/hostdisk.c (read_device_map): Improve TRANSLATORS * grub-core/kern/emu/hostdisk.c (read_device_map): Improve TRANSLATORS

6
grub-core/fs/udf.c
View file

@ -807,6 +807,9 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf)
grub_uint16_t *utf16 = NULL; grub_uint16_t *utf16 = NULL;
grub_size_t utf16len = 0; grub_size_t utf16len = 0;
if (sz == 0)
return NULL;
if (raw[0] != 8 && raw[0] != 16) if (raw[0] != 8 && raw[0] != 16)
return NULL; return NULL;
@ -989,7 +992,8 @@ grub_udf_read_symlink (grub_fshelp_node_t node)
/* in 4 + n bytes. out, at most: 1 + 2 * n bytes. */ /* in 4 + n bytes. out, at most: 1 + 2 * n bytes. */
if (optr != out) if (optr != out)
*optr++ = '/'; *optr++ = '/';
read_string (ptr + 4, s - 4, optr); if (!read_string (ptr + 4, s - 4, optr))
goto fail;
optr += grub_strlen (optr); optr += grub_strlen (optr);
break; break;
default: default: