Merge mainline into legacy_parser

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-12 14:01:25 +02:00
commit 2d06d22b0c
4 changed files with 26 additions and 4 deletions

View file

@ -830,8 +830,15 @@ void xz_dec_reset(struct xz_dec *s)
s->allow_buf_error = false;
s->pos = 0;
memzero(&s->block, sizeof(s->block));
memzero(&s->index, sizeof(s->index));
{
uint8_t *t;
t = s->block.hash.crc32_context;
memzero(&s->block, sizeof(s->block));
s->block.hash.crc32_context = t;
t = s->index.hash.crc32_context;
memzero(&s->index, sizeof(s->index));
s->index.hash.crc32_context = t;
}
s->temp.pos = 0;
s->temp.size = STREAM_HEADER_SIZE;