Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove windowbits change for level 1 #1431

Merged
merged 1 commit into from
Feb 8, 2023

Conversation

rhpvorderman
Copy link

@rhpvorderman rhpvorderman commented Feb 8, 2023

This fixes the current 2.0.x branch in this regard. It is a single commit, so it can be cherry-picked for #1393

Fixes #1417

@nmoinvaz
Copy link
Member

nmoinvaz commented Feb 8, 2023

I think that whole if statement can go bye-bye. Looking back, I think it was commit 951764a that allowed any size of window with deflate quick algorithm.

@rhpvorderman rhpvorderman changed the title Do not override WindowBits for level 1 if WindowBits is lower than 13 Remove windowbits change for level 1 Feb 8, 2023
@rhpvorderman
Copy link
Author

@nmoinvaz
Done. I amended the commit. Either this commit or ce6789c can be merged into the latest 2.0.x release to fix the problem.

@Dead2 Dead2 changed the base branch from 2.0.x to stable-pre-release February 8, 2023 11:50
Copy link
Member

@Dead2 Dead2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov
Copy link

codecov bot commented Feb 8, 2023

Codecov Report

Base: 81.11% // Head: 75.04% // Decreases project coverage by -6.07% ⚠️

Coverage data is based on head (b2102b2) compared to base (b56a2fd).
Patch has no changes to coverable lines.

Additional details and impacted files
@@                  Coverage Diff                   @@
##           stable-pre-release    #1431      +/-   ##
======================================================
- Coverage               81.11%   75.04%   -6.07%     
======================================================
  Files                      76      139      +63     
  Lines                    8344    13996    +5652     
  Branches                 1373     2504    +1131     
======================================================
+ Hits                     6768    10503    +3735     
- Misses                   1036     2452    +1416     
- Partials                  540     1041     +501     
Flag Coverage Δ
macos_clang 69.81% <ø> (+0.01%) ⬆️
macos_gcc 68.45% <ø> (-0.01%) ⬇️
ubuntu_clang ?
ubuntu_clang_debug ?
ubuntu_clang_inflate_allow_invalid_dist ?
ubuntu_clang_inflate_strict ?
ubuntu_clang_mmap ?
ubuntu_clang_msan ?
ubuntu_clang_pigz ∅ <ø> (∅)
ubuntu_clang_pigz_no_optim ∅ <ø> (∅)
ubuntu_clang_pigz_no_threads ?
ubuntu_gcc ?
ubuntu_gcc_aarch64 70.64% <ø> (-4.87%) ⬇️
ubuntu_gcc_aarch64_compat_no_opt 68.90% <ø> (-4.27%) ⬇️
ubuntu_gcc_aarch64_no_acle 69.47% <ø> (-5.23%) ⬇️
ubuntu_gcc_aarch64_no_neon 69.93% <ø> (-5.29%) ⬇️
ubuntu_gcc_armhf ?
ubuntu_gcc_armhf_compat_no_opt 68.92% <ø> (-4.24%) ⬇️
ubuntu_gcc_armhf_no_acle 70.85% <ø> (-4.87%) ⬇️
ubuntu_gcc_armhf_no_neon ?
ubuntu_gcc_armsf 70.20% <ø> (-5.34%) ⬇️
ubuntu_gcc_armsf_compat_no_opt 69.82% <ø> (-3.34%) ⬇️
ubuntu_gcc_compat_no_opt ?
ubuntu_gcc_mingw_i686 ?
ubuntu_gcc_mingw_x86_64 68.77% <ø> (+68.77%) ⬆️
ubuntu_gcc_no_avx2 70.54% <ø> (-5.00%) ⬇️
ubuntu_gcc_no_ctz 71.24% <ø> (-5.15%) ⬇️
ubuntu_gcc_no_ctzll 70.96% <ø> (-5.13%) ⬇️
ubuntu_gcc_no_pclmulqdq 66.82% <ø> (-5.07%) ⬇️
ubuntu_gcc_no_sse2 69.57% <ø> (-4.92%) ⬇️
ubuntu_gcc_no_sse4 66.97% <ø> (-5.10%) ⬇️
ubuntu_gcc_o3 68.26% <ø> (-4.97%) ⬇️
ubuntu_gcc_osb 70.78% <ø> (-5.50%) ⬇️
ubuntu_gcc_pigz 33.79% <ø> (+0.85%) ⬆️
ubuntu_gcc_pigz_aarch64 36.84% <ø> (+0.92%) ⬆️
ubuntu_gcc_ppc 70.83% <ø> (-5.08%) ⬇️
ubuntu_gcc_ppc64 71.61% <ø> (-5.06%) ⬇️
ubuntu_gcc_ppc64le 70.48% <ø> (-4.94%) ⬇️
ubuntu_gcc_s390x 72.32% <ø> (-4.86%) ⬇️
ubuntu_gcc_sparc64 ?
win64_gcc ∅ <ø> (∅)
win64_gcc_compat_no_opt ∅ <ø> (∅)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
deflate.c 76.07% <ø> (-0.33%) ⬇️
zutil_p.h 0.00% <0.00%> (-71.43%) ⬇️
arch/x86/slide_avx.c 55.00% <0.00%> (-45.00%) ⬇️
zutil.c 41.66% <0.00%> (-40.48%) ⬇️
arch/x86/adler32_avx.c 63.15% <0.00%> (-36.85%) ⬇️
arch/x86/compare258_avx.c 66.66% <0.00%> (-33.34%) ⬇️
deflate.h 20.00% <0.00%> (-27.83%) ⬇️
trees.c 84.15% <0.00%> (-12.34%) ⬇️
trees_emit.h 92.30% <0.00%> (-7.70%) ⬇️
test/fuzz/checksum_fuzzer.c 86.66% <0.00%> (-7.57%) ⬇️
... and 113 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@Dead2 Dead2 merged commit 02cf11e into zlib-ng:stable-pre-release Feb 8, 2023
@Dead2 Dead2 mentioned this pull request Feb 8, 2023
@rhpvorderman rhpvorderman deleted the wbitspatch branch February 8, 2023 14:18
Dead2 added a commit that referenced this pull request Mar 7, 2023
Changes since 2.0.6:
- Fix CVE-2022-37434 #1328
- Fix chunkmemset #1196
- Fix deflateBound too small #1236
- Fix Z_SOLO #1263
- Fix ACLE variant of crc32 #1274
- Fix inflateBack #1311
- Fix deflate_quick windowsize #1431
- Fix DFLTCC bugs related to adler32 #1349 and #1390
- Fix warnings #1194 #1312 #1362
- MacOS build fix #1198
- Add invalid windowBits handling #1293
- Support for Force TZCNT #1186
- Support for aligned_alloc() #1360
- Minideflate improvements #1175 #1238
- Dont use unaligned access for memcpy #1309
- Build system #1209 #1233 #1267 #1273 #1278 #1292 #1316 #1318 #1365
- Test improvements #1208 #1227 #1241 #1353
- Cleanup #1266
- Documentation #1205 #1359
- Misc improvements #1294 #1297 #1306 #1344 #1348
- Backported zlib fixes
- Backported CI workflows from Develop branch
Dead2 added a commit that referenced this pull request Mar 17, 2023
Changes since 2.0.6:
- Fix CVE-2022-37434 #1328
- Fix chunkmemset #1196
- Fix deflateBound too small #1236
- Fix Z_SOLO #1263
- Fix ACLE variant of crc32 #1274
- Fix inflateBack #1311
- Fix deflate_quick windowsize #1431
- Fix DFLTCC bugs related to adler32 #1349 and #1390
- Fix warnings #1194 #1312 #1362
- MacOS build fix #1198
- Add invalid windowBits handling #1293
- Support for Force TZCNT #1186
- Support for aligned_alloc() #1360
- Minideflate improvements #1175 #1238
- Dont use unaligned access for memcpy #1309
- Build system #1209 #1233 #1267 #1273 #1278 #1292 #1316 #1318 #1365
- Test improvements #1208 #1227 #1241 #1353
- Cleanup #1266
- Documentation #1205 #1359
- Misc improvements #1294 #1297 #1306 #1344 #1348
- Backported zlib fixes
- Backported CI workflows from Develop branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants