c364d32cc
Denys Vlasenko
2018-02-03
Subject
bzip2: runningOrder[] values are always 0..255, make it uint8
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/libarchive/bz/blocksort.c+4 -5
| @@ -732,7 +732,7 @@ void mainSort(EState* state, | |
| int32_t i, j; | |
| Bool bigDone[256]; | |
| /* bbox: moved to EState to save stack | |
| - | int32_t runningOrder[256]; |
| + | uint8_t runningOrder[256]; |
| int32_t copyStart[256]; | |
| int32_t copyEnd [256]; | |
| */ | |
| @@ -833,16 +833,15 @@ void mainSort(EState* state, | |
| /*h = h / 3;*/ | |
| h = (h * 171) >> 9; /* bbox: fast h/3 */ | |
| for (i = h; i <= 255; i++) { | |
| - | int32_t vv; |
| - | vv = runningOrder[i]; |
| + | unsigned vv; |
| + | vv = runningOrder[i]; /* uint8[] */ |
| j = i; | |
| while (BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv)) { | |
| runningOrder[j] = runningOrder[j-h]; | |
| j = j - h; | |
| if (j <= (h - 1)) | |
| - | goto zero; |
| + | break; |
| } | |
| - | zero: |
| runningOrder[j] = vv; | |
| } | |
| } while (h != 1); | |
archival/libarchive/bz/bzlib_private.h+1 -1
| @@ -192,7 +192,7 @@ typedef struct EState { | |
| int32_t BZ2_hbMakeCodeLengths__weight[BZ_MAX_ALPHA_SIZE * 2]; | |
| int32_t BZ2_hbMakeCodeLengths__parent[BZ_MAX_ALPHA_SIZE * 2]; | |
| - | int32_t mainSort__runningOrder[256]; |
| + | uint8_t mainSort__runningOrder[256]; |
| int32_t mainSort__copyStart[256]; | |
| int32_t mainSort__copyEnd[256]; | |
| } EState; | |