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

MAke a separate scratch for decompressor

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-21 19:39:51 +02:00
parent f8926c32b4
commit e0a8ef26e4
5 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
grub-core/lib/xzembed/xz_dec_lzma2.c
View file

@ -1103,7 +1103,6 @@ enum xz_ret xz_dec_lzma2_run(
#ifdef GRUB_EMBED_DECOMPRESSOR
#include <grub/decompressor.h>
static struct xz_dec_lzma2 lzma2;
static char dict[GRUB_DECOMPRESSOR_DICT_SIZE];
#endif
struct xz_dec_lzma2 * xz_dec_lzma2_create(uint32_t dict_max)
@ -1128,14 +1127,8 @@ struct xz_dec_lzma2 * xz_dec_lzma2_create(uint32_t dict_max)
}
#else
if (dict_max > GRUB_DECOMPRESSOR_DICT_SIZE)
return NULL;
s = &lzma2;
if (dict_max > 0) {
s->dict.buf = (void *) &dict;
}
s->dict.buf = grub_decompressor_scratch;
#endif
s->dict.allocated = dict_max;
@ -1165,9 +1158,6 @@ enum xz_ret xz_dec_lzma2_reset(
s->dict.buf = newdict;
s->dict.allocated = s->dict.size;
}
#else
if (s->dict.allocated > 0 && s->dict.allocated < s->dict.size)
return XZ_MEMLIMIT_ERROR;
#endif
s->dict.end = s->dict.size;