|
 |
f96e0b |
From 4942f9b133e52828d2441309beea0e9278e8b80c Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Sun, 22 Jul 2012 16:27:03 +0200
|
|
|
f96e0b |
Subject: [PATCH 013/482] * grub-core/lib/xzembed/xz_dec_stream.c
|
|
|
f96e0b |
(hash_validate): Fix behaviour if hash function is unavailable.
|
|
|
f96e0b |
(dec_stream_header): Likewise.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 6 ++++++
|
|
|
f96e0b |
grub-core/lib/xzembed/xz_dec_stream.c | 15 ++++++++++-----
|
|
|
f96e0b |
2 files changed, 16 insertions(+), 5 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 38374a3..892d31b 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,11 @@
|
|
|
f96e0b |
2012-07-22 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ * grub-core/lib/xzembed/xz_dec_stream.c (hash_validate): Fix behaviour
|
|
|
f96e0b |
+ if hash function is unavailable.
|
|
|
f96e0b |
+ (dec_stream_header): Likewise.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2012-07-22 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
* grub-core/normal/autofs.c (autoload_fs_module): Save and restore
|
|
|
f96e0b |
filter state.
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/grub-core/lib/xzembed/xz_dec_stream.c b/grub-core/lib/xzembed/xz_dec_stream.c
|
|
|
f96e0b |
index 0d79b1f..6170b0c 100644
|
|
|
f96e0b |
--- a/grub-core/lib/xzembed/xz_dec_stream.c
|
|
|
f96e0b |
+++ b/grub-core/lib/xzembed/xz_dec_stream.c
|
|
|
f96e0b |
@@ -403,18 +403,25 @@ static enum xz_ret hash_validate(struct xz_dec *s, struct xz_buf *b,
|
|
|
f96e0b |
}
|
|
|
f96e0b |
#endif
|
|
|
f96e0b |
|
|
|
f96e0b |
- do {
|
|
|
f96e0b |
+ if (b->in_pos == b->in_size)
|
|
|
f96e0b |
+ return XZ_OK;
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ if (!crc32 && s->hash_size == 0)
|
|
|
f96e0b |
+ s->pos += 8;
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ while (s->pos < (crc32 ? 32 : s->hash_size * 8)) {
|
|
|
f96e0b |
if (b->in_pos == b->in_size)
|
|
|
f96e0b |
return XZ_OK;
|
|
|
f96e0b |
|
|
|
f96e0b |
#ifndef GRUB_EMBED_DECOMPRESSOR
|
|
|
f96e0b |
- if (hash && s->hash_value[s->pos / 8] != b->in[b->in_pos++])
|
|
|
f96e0b |
+ if (hash && s->hash_value[s->pos / 8] != b->in[b->in_pos])
|
|
|
f96e0b |
return XZ_DATA_ERROR;
|
|
|
f96e0b |
#endif
|
|
|
f96e0b |
+ b->in_pos++;
|
|
|
f96e0b |
|
|
|
f96e0b |
s->pos += 8;
|
|
|
f96e0b |
|
|
|
f96e0b |
- } while (s->pos < (crc32 ? 32 : s->hash_size * 8));
|
|
|
f96e0b |
+ }
|
|
|
f96e0b |
|
|
|
f96e0b |
#ifndef GRUB_EMBED_DECOMPRESSOR
|
|
|
f96e0b |
if (s->hash)
|
|
|
f96e0b |
@@ -529,8 +536,6 @@ static enum xz_ret dec_stream_header(struct xz_dec *s)
|
|
|
f96e0b |
s->hash->init(s->index.hash.hash_context);
|
|
|
f96e0b |
s->hash->init(s->block.hash.hash_context);
|
|
|
f96e0b |
}
|
|
|
f96e0b |
- if (!s->hash)
|
|
|
f96e0b |
- return XZ_OPTIONS_ERROR;
|
|
|
f96e0b |
#endif
|
|
|
f96e0b |
}
|
|
|
f96e0b |
else
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|