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

igzip: fix issues reported by static code analysis

Browse Source 
compute_dist_code() and compute_dist_icf_code() in huffman.h:
    Correct `assert(msb >= 1)` to `assert(msb >= 2)`.
    `msb` cannot be lower than 2 as it would result in corrupt computations.

get_dist_code() in huffman.h:
    Remove dead `if` statement at the beginning of the function.
    `dist` must be equal 1 or above in this function.

Signed-off-by: Tomasz Kantecki <tomasz.kantecki@intel.com>
This commit is contained in:
Tomasz Kantecki 2023-12-19 10:44:31 +00:00 committed by Marcel Cornu
parent 402bd4f773
commit 6ef2abe80e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
igzip/huffman.h
View File

@ -104,7 +104,7 @@ static void compute_dist_code(struct isal_hufftables *hufftables, uint16_t dist,
uint32_t code; uint32_t code;
msb = bsr(dist); msb = bsr(dist);
assert(msb >= 1); assert(msb >= 2);
num_extra_bits = msb - 2; num_extra_bits = msb - 2;
extra_bits = dist & ((1 << num_extra_bits) - 1); extra_bits = dist & ((1 << num_extra_bits) - 1);
dist >>= num_extra_bits; dist >>= num_extra_bits;
@ -119,8 +119,6 @@ static void compute_dist_code(struct isal_hufftables *hufftables, uint16_t dist,
static inline void get_dist_code(struct isal_hufftables *hufftables, uint32_t dist, static inline void get_dist_code(struct isal_hufftables *hufftables, uint32_t dist,
uint64_t * code, uint64_t * len) uint64_t * code, uint64_t * len)
{ {
if (dist < 1)
dist = 0;
assert(dist >= 1); assert(dist >= 1);
assert(dist <= 32768); assert(dist <= 32768);
if (dist <= IGZIP_DIST_TABLE_SIZE) { if (dist <= IGZIP_DIST_TABLE_SIZE) {
@ -161,7 +159,7 @@ static void compute_dist_icf_code(uint32_t dist, uint32_t * code, uint32_t * ext
dist -= 1; dist -= 1;
msb = bsr(dist); msb = bsr(dist);
assert(msb >= 1); assert(msb >= 2);
num_extra_bits = msb - 2; num_extra_bits = msb - 2;
*extra_bits = dist & ((1 << num_extra_bits) - 1); *extra_bits = dist & ((1 << num_extra_bits) - 1);
dist >>= num_extra_bits; dist >>= num_extra_bits;