From 8fafcbcb318598b73e03966b3b6b0525af1a0698 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 4 Nov 2017 14:54:56 +1100 Subject: [PATCH] Tweak the flate end_of_block check. --- gen/c/std/flate.c | 12 ++++++++---- std/flate/decode_flate.puffs | 11 +++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index ff9ea6dc..66421522 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -1135,6 +1135,9 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_blocks( if (status) { goto suspend; } + if (self->private_impl.f_end_of_block) { + goto label_0_continue; + } PUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); @@ -1154,11 +1157,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_blocks( if (status) { goto suspend; } - if (!self->private_impl.f_end_of_block) { - status = - PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK; - goto exit; + if (self->private_impl.f_end_of_block) { + goto label_0_continue; } + status = + PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK; + goto exit; } goto ok; diff --git a/std/flate/decode_flate.puffs b/std/flate/decode_flate.puffs index 35f7dc91..03af762a 100644 --- a/std/flate/decode_flate.puffs +++ b/std/flate/decode_flate.puffs @@ -201,11 +201,14 @@ pri func flate_decoder.decode_blocks?(dst writer1, src reader1)() { this.end_of_block = false this.decode_huffman_fast?(dst:in.dst, src:in.src) - // TODO: check this.end_of_block. - this.decode_huffman_slow?(dst:in.dst, src:in.src) - if not this.end_of_block { - return error "internal error: inconsistent Huffman end_of_block" + if this.end_of_block { + continue } + this.decode_huffman_slow?(dst:in.dst, src:in.src) + if this.end_of_block { + continue + } + return error "internal error: inconsistent Huffman end_of_block" } }