AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2024-11-25 04:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #176 from szabadka/master

Browse Source 
Fix a bug in CopyUncompressedBlockToOutput().
This commit is contained in:
szabadka 2015-09-25 19:33:03 +02:00
commit c11ce30a87
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dec/decode.c
View File

@ -826,23 +826,16 @@ BrotliResult BROTLI_NOINLINE CopyUncompressedBlockToOutput(BrotliOutput output,
/* No break, if state is updated, continue to next state */ /* No break, if state is updated, continue to next state */
case BROTLI_STATE_UNCOMPRESSED_WRITE_1: case BROTLI_STATE_UNCOMPRESSED_WRITE_1:
case BROTLI_STATE_UNCOMPRESSED_WRITE_2: case BROTLI_STATE_UNCOMPRESSED_WRITE_2:
case BROTLI_STATE_UNCOMPRESSED_WRITE_3:
result = WriteRingBuffer(output, s); result = WriteRingBuffer(output, s);
if (result != BROTLI_RESULT_SUCCESS) { if (result != BROTLI_RESULT_SUCCESS) {
return result; return result;
} }
pos &= s->ringbuffer_mask; pos &= s->ringbuffer_mask;
s->max_distance = s->max_backward_distance; s->max_distance = s->max_backward_distance;
if (s->substate_uncompressed == BROTLI_STATE_UNCOMPRESSED_WRITE_2) {
s->substate_uncompressed = BROTLI_STATE_UNCOMPRESSED_SHORT;
break;
}
if (s->substate_uncompressed == BROTLI_STATE_UNCOMPRESSED_WRITE_1) {
/* If we wrote past the logical end of the ringbuffer, copy the tail /* If we wrote past the logical end of the ringbuffer, copy the tail
of the ringbuffer to its beginning and flush the ringbuffer to the of the ringbuffer to its beginning and flush the ringbuffer to the
output. */ output. */
memcpy(s->ringbuffer, s->ringbuffer_end, (size_t)pos); memcpy(s->ringbuffer, s->ringbuffer_end, (size_t)pos);
}
if (pos + s->meta_block_remaining_len >= s->ringbuffer_size) { if (pos + s->meta_block_remaining_len >= s->ringbuffer_size) {
s->substate_uncompressed = BROTLI_STATE_UNCOMPRESSED_FILL; s->substate_uncompressed = BROTLI_STATE_UNCOMPRESSED_FILL;
} else { } else {
@ -865,9 +858,8 @@ BrotliResult BROTLI_NOINLINE CopyUncompressedBlockToOutput(BrotliOutput output,
} }
s->to_write = s->ringbuffer_size; s->to_write = s->ringbuffer_size;
s->partially_written = 0; s->partially_written = 0;
s->substate_uncompressed = BROTLI_STATE_UNCOMPRESSED_WRITE_3; s->substate_uncompressed = BROTLI_STATE_UNCOMPRESSED_WRITE_1;
break; break;
/* No break, continue to next state */
case BROTLI_STATE_UNCOMPRESSED_COPY: case BROTLI_STATE_UNCOMPRESSED_COPY:
/* Copy straight from the input onto the ringbuffer. The ringbuffer will /* Copy straight from the input onto the ringbuffer. The ringbuffer will
be flushed to the output at a later time. */ be flushed to the output at a later time. */

3
dec/state.h
View File

@ -70,8 +70,7 @@ typedef enum {
BROTLI_STATE_UNCOMPRESSED_FILL, BROTLI_STATE_UNCOMPRESSED_FILL,
BROTLI_STATE_UNCOMPRESSED_COPY, BROTLI_STATE_UNCOMPRESSED_COPY,
BROTLI_STATE_UNCOMPRESSED_WRITE_1, BROTLI_STATE_UNCOMPRESSED_WRITE_1,
BROTLI_STATE_UNCOMPRESSED_WRITE_2, BROTLI_STATE_UNCOMPRESSED_WRITE_2
BROTLI_STATE_UNCOMPRESSED_WRITE_3
} BrotliRunningUncompressedState; } BrotliRunningUncompressedState;
typedef enum { typedef enum {