Skip to content

v4.8.2 proposal #12129

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.

Sign up for GitHub

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

Merged
MylesBorins merged 4 commits into from
Apr 4, 2017
Merged

v4.8.2 proposal #12129

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d7fba4
crypto: fix memory leak if certificate is revoked
Mar 28, 2017
2e52a26
deps: upgrade zlib to 1.2.11
sam-github Jan 20, 2017
253980f
deps: fix CLEAR_HASH macro to be usable as a single statement
sam-github Feb 28, 2017
ea2ceac
2017-04-04, Version 4.8.2 'Argon' (Maintenance)
MylesBorins Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
deps: fix CLEAR_HASH macro to be usable as a single statement 
Apply unreleased (as of zlib v1.2.11) patch from upstream:
- madler/zlib@38e8ce3

Original commit message:
  Fix CLEAR_HASH macro to be usable as a single statement.

  As it is used in deflateParams().

PR-URL: #11616
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
@sam-github @MylesBorins
sam-github authored and MylesBorins committed Mar 29, 2017
commit 253980ff38aedf51e1f37fa3d155419f932da140
7 changes: 5 additions & 2 deletions deps/zlib/deflate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,11 @@ local const config configuration_table[10] = {
* prev[] will be initialized on the fly.
*/
#define CLEAR_HASH(s) \
s->head[s->hash_size-1] = NIL; \
zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
do { \
s->head[s->hash_size-1] = NIL; \
zmemzero((Bytef *)s->head, \
(unsigned)(s->hash_size-1)*sizeof(*s->head)); \
} while (0)

/* ===========================================================================
* Slide the hash table when sliding the window down (could be avoided with 32
Expand Down