generic-library/isa-l
1
0
Fork 0
mirror of https://github.com/intel/isa-l.git synced 2024-12-12 17:33:50 +01:00
Code Issues Projects Releases Wiki Activity

igzip: Remove undefined behavior in igzip.c

Browse Source 
Remove unaligend data access in
write_deflate_header_unaligned_stateless

Change-Id: I7defa5621d8dc188edc51d22d29155ed3687c49d
Signed-off-by: Roy Oursler <roy.j.oursler@intel.com>
This commit is contained in:
Roy Oursler 2019-04-23 15:03:24 -07:00 committed by Greg Tucker
parent 906332850d
commit db59b1082f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
igzip/igzip.c
View File

@ -1732,8 +1732,8 @@ static int write_deflate_header_unaligned_stateless(struct isal_zstream *stream)
struct isal_hufftables *hufftables = stream->hufftables; struct isal_hufftables *hufftables = stream->hufftables;
unsigned int count; unsigned int count;
uint64_t bit_count; uint64_t bit_count;
uint64_t *header_next; uint8_t *header_next;
uint64_t *header_end; uint8_t *header_end;
uint64_t header_bits; uint64_t header_bits;
if (state->bitbuf.m_bit_count == 0) if (state->bitbuf.m_bit_count == 0)
@ -1744,24 +1744,25 @@ static int write_deflate_header_unaligned_stateless(struct isal_zstream *stream)
set_buf(&state->bitbuf, stream->next_out, stream->avail_out); set_buf(&state->bitbuf, stream->next_out, stream->avail_out);
header_next = (uint64_t *) hufftables->deflate_hdr; header_next = hufftables->deflate_hdr;
header_end = header_next + hufftables->deflate_hdr_count / 8; header_end = header_next +
(hufftables->deflate_hdr_count / sizeof(header_bits)) * sizeof(header_bits);
header_bits = *header_next; header_bits = load_u64(header_next);
if (stream->end_of_stream == 0) if (stream->end_of_stream == 0)
header_bits--; header_bits--;
else else
state->has_eob_hdr = 1; state->has_eob_hdr = 1;
header_next++; header_next += sizeof(header_bits);
/* Write out Complete Header bits */ /* Write out Complete Header bits */
for (; header_next <= header_end; header_next++) { for (; header_next <= header_end; header_next += sizeof(header_bits)) {
write_bits(&state->bitbuf, header_bits, 32); write_bits(&state->bitbuf, header_bits, 32);
header_bits >>= 32; header_bits >>= 32;
write_bits(&state->bitbuf, header_bits, 32); write_bits(&state->bitbuf, header_bits, 32);
header_bits = *header_next; header_bits = load_u64(header_next);
} }
bit_count = bit_count =
(hufftables->deflate_hdr_count & 0x7) * 8 + hufftables->deflate_hdr_extra_bits; (hufftables->deflate_hdr_count & 0x7) * 8 + hufftables->deflate_hdr_extra_bits;