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

* grub-core/lib/xzembed/xz_dec_stream.c (hash_validate): Fix behaviour

Browse source 
if hash function is unavailable.
	(dec_stream_header): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-07-22 16:27:03 +02:00
parent e81db8b5fd
commit e73bb80170
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-07-22 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/xzembed/xz_dec_stream.c (hash_validate): Fix behaviour
if hash function is unavailable.
(dec_stream_header): Likewise.
2012-07-22 Vladimir Serbinenko <phcoder@gmail.com> 2012-07-22 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/autofs.c (autoload_fs_module): Save and restore * grub-core/normal/autofs.c (autoload_fs_module): Save and restore

15
grub-core/lib/xzembed/xz_dec_stream.c
View file

@ -403,18 +403,25 @@ static enum xz_ret hash_validate(struct xz_dec *s, struct xz_buf *b,
} }
#endif #endif
do { if (b->in_pos == b->in_size)
return XZ_OK;
if (!crc32 && s->hash_size == 0)
s->pos += 8;
while (s->pos < (crc32 ? 32 : s->hash_size * 8)) {
if (b->in_pos == b->in_size) if (b->in_pos == b->in_size)
return XZ_OK; return XZ_OK;
#ifndef GRUB_EMBED_DECOMPRESSOR #ifndef GRUB_EMBED_DECOMPRESSOR
if (hash && s->hash_value[s->pos / 8] != b->in[b->in_pos++]) if (hash && s->hash_value[s->pos / 8] != b->in[b->in_pos])
return XZ_DATA_ERROR; return XZ_DATA_ERROR;
#endif #endif
b->in_pos++;
s->pos += 8; s->pos += 8;
} while (s->pos < (crc32 ? 32 : s->hash_size * 8)); }
#ifndef GRUB_EMBED_DECOMPRESSOR #ifndef GRUB_EMBED_DECOMPRESSOR
if (s->hash) if (s->hash)
@ -529,8 +536,6 @@ static enum xz_ret dec_stream_header(struct xz_dec *s)
s->hash->init(s->index.hash.hash_context); s->hash->init(s->index.hash.hash_context);
s->hash->init(s->block.hash.hash_context); s->hash->init(s->block.hash.hash_context);
} }
if (!s->hash)
return XZ_OPTIONS_ERROR;
#endif #endif
} }
else else