luo980/miniz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #329 from iibclothier/master

Browse Source 
Remedy CVE-2018-12913
This commit is contained in:
Martin Raiber 2024-12-29 22:45:57 +01:00 committed by GitHub
commit 0c30a001bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci-fuzz.yml vendored
View File

@ -16,8 +16,8 @@ jobs:
fuzz-seconds: 900 fuzz-seconds: 900
dry-run: false dry-run: false
- name: Upload Crash - name: Upload Crash
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v4
if: failure() if: failure()
with: with:
name: artifacts name: artifacts
path: ./out/artifacts path: ./out/artifacts

6
miniz_tinfl.c
View File

@ -490,6 +490,12 @@ extern "C"
} }
bit_buf >>= code_len; bit_buf >>= code_len;
num_bits -= code_len; num_bits -= code_len;
/* assert(sym2 != 0 && counter != 0); */
if (sym2 == 0 && counter == 0)
{
TINFL_CR_RETURN_FOREVER(40, TINFL_STATUS_FAILED);
}
pOut_buf_cur[0] = (mz_uint8)counter; pOut_buf_cur[0] = (mz_uint8)counter;
if (sym2 & 256) if (sym2 & 256)