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

* grub-core/fs/squash4.c (lzo_decompress): Set grub_errno on error.

Browse source 
Allocate at lest 8192 for temporary buffer as required for lzo.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-26 01:16:25 +02:00
parent daa59f47f6
commit b282dfe5ac
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-04-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/squash4.c (lzo_decompress): Set grub_errno on error.
Allocate at lest 8192 for temporary buffer as required for lzo.
2012-04-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-04-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/fat.c (grub_fat_mount): Don't add logical_sector_bits * grub-core/fs/fat.c (grub_fat_mount): Don't add logical_sector_bits

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

@ -298,13 +298,17 @@ lzo_decompress (char *inbuf, grub_size_t insize, grub_off_t off,
lzo_uint usize = data->blksz; lzo_uint usize = data->blksz;
grub_uint8_t *udata; grub_uint8_t *udata;
udata = grub_malloc (data->blksz); if (usize < 8192)
usize = 8192;
udata = grub_malloc (usize);
if (!udata) if (!udata)
return -1; return -1;
if (lzo1x_decompress_safe ((grub_uint8_t *) inbuf, if (lzo1x_decompress_safe ((grub_uint8_t *) inbuf,
insize, udata, &usize, NULL) != LZO_E_OK) insize, udata, &usize, NULL) != LZO_E_OK)
{ {
grub_error (GRUB_ERR_BAD_FS, "incorrect compressed chunk");
grub_free (udata); grub_free (udata);
return -1; return -1;
} }