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

IBM Z DFLTCC: Fix updating strm.adler with inflate() #1349

Merged
merged 1 commit into from Sep 26, 2022

Conversation

iii-i
Copy link
Member

@iii-i iii-i commented Sep 17, 2022

inflate() does not update strm.adler with DFLTCC.
Add a missing assignment to dfltcc_inflate() to fix this.
Note that deflate() is not affected.
Also add a test to prevent regressions.

@codecov
Copy link

codecov bot commented Sep 17, 2022

Codecov Report

Merging #1349 (4bc07c7) into develop (8353094) will decrease coverage by 0.02%.
The diff coverage is 50.00%.

@@             Coverage Diff             @@
##           develop    #1349      +/-   ##
===========================================
- Coverage    84.17%   84.14%   -0.03%     
===========================================
  Files          120      120              
  Lines        10438    10439       +1     
  Branches      2657     2658       +1     
===========================================
- Hits          8786     8784       -2     
- Misses        1031     1033       +2     
- Partials       621      622       +1     
Flag Coverage Δ
macos_clang 41.94% <ø> (ø)
macos_gcc 73.82% <0.00%> (-0.01%) ⬇️
ubuntu_clang 83.87% <ø> (ø)
ubuntu_clang_debug 83.44% <ø> (+0.17%) ⬆️
ubuntu_clang_inflate_allow_invalid_dist 83.52% <ø> (ø)
ubuntu_clang_inflate_strict 83.86% <ø> (ø)
ubuntu_clang_mmap 84.20% <ø> (ø)
ubuntu_clang_pigz ?
ubuntu_clang_pigz_no_optim 41.49% <ø> (ø)
ubuntu_clang_pigz_no_threads 39.67% <ø> (ø)
ubuntu_clang_reduced_mem 84.37% <ø> (ø)
ubuntu_gcc 75.72% <0.00%> (-0.01%) ⬇️
ubuntu_gcc_aarch64 77.42% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_aarch64_compat_no_opt 75.57% <0.00%> (-0.03%) ⬇️
ubuntu_gcc_aarch64_no_acle 76.14% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_aarch64_no_neon 76.14% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_armhf 77.36% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_armhf_compat_no_opt 75.43% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_armhf_no_acle 77.39% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_armhf_no_neon 77.28% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_armsf 77.19% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_armsf_compat_no_opt 75.35% <0.00%> (+0.01%) ⬆️
ubuntu_gcc_compat_no_opt 76.96% <0.00%> (-0.03%) ⬇️
ubuntu_gcc_compat_sprefix 74.24% <0.00%> (+0.13%) ⬆️
ubuntu_gcc_m32 73.60% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_mingw_i686 0.00% <0.00%> (ø)
ubuntu_gcc_mingw_x86_64 0.00% <0.00%> (ø)
ubuntu_gcc_no_avx2 74.74% <0.00%> (-0.01%) ⬇️
ubuntu_gcc_no_ctz 74.96% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_no_ctzll 74.98% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_no_pclmulqdq 73.93% <0.00%> (-0.06%) ⬇️
ubuntu_gcc_no_sse2 74.94% <0.00%> (-0.01%) ⬇️
ubuntu_gcc_no_sse4 74.61% <0.00%> (+0.03%) ⬆️
ubuntu_gcc_o1 74.50% <0.00%> (-0.01%) ⬇️
ubuntu_gcc_osb ∅ <ø> (∅)
ubuntu_gcc_pigz 37.93% <ø> (+0.02%) ⬆️
ubuntu_gcc_pigz_aarch64 39.01% <ø> (+0.08%) ⬆️
ubuntu_gcc_ppc 73.72% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_ppc64 74.59% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_ppc64le 74.53% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_ppc_no_power8 74.65% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_s390x 74.98% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_s390x_dfltcc 72.22% <50.00%> (-0.02%) ⬇️
ubuntu_gcc_s390x_dfltcc_compat 73.75% <50.00%> (-0.01%) ⬇️
ubuntu_gcc_s390x_no_crc32 74.77% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_sparc64 74.88% <0.00%> (-0.02%) ⬇️
ubuntu_gcc_sprefix 73.76% <0.00%> (-0.02%) ⬇️
win64_gcc 74.12% <0.00%> (+0.04%) ⬆️
win64_gcc_compat_no_opt 74.84% <0.00%> (-0.02%) ⬇️

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

Impacted Files Coverage Δ
test/test_inflate_adler32.cc 64.70% <0.00%> (-4.05%) ⬇️
arch/s390/dfltcc_inflate.c 88.88% <100.00%> (ø)
adler32_p.h 96.42% <0.00%> (-3.58%) ⬇️
arch/x86/adler32_sse42.c 98.46% <0.00%> (-1.54%) ⬇️

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

inflate() does not update strm.adler with DFLTCC.
Add a missing assignment to dfltcc_inflate() to fix this.
Note that deflate() is not affected.
Also add a test to prevent regressions.
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

@Dead2 Dead2 merged commit d38dd92 into zlib-ng:develop Sep 26, 2022
@iii-i iii-i deleted the dfltcc-inflate-adler branch November 22, 2022 10:00
@iii-i iii-i mentioned this pull request Jan 3, 2023
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

2 participants