diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2017-02-28 21:46:29 +0300 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2017-03-29 21:28:53 +0300 |
| commit | 253980ff38aedf51e1f37fa3d155419f932da140 (patch) | |
| tree | b8975000242350778cb5bc47054deb77d1a21cbe | |
| parent | 2e52a2699b5d5c646393c9f62f79f8607d32e517 (diff) | |
deps: fix CLEAR_HASH macro to be usable as a single statement
Apply unreleased (as of zlib v1.2.11) patch from upstream:
- https://github.com/madler/zlib/commit/38e8ce32afbaa82f67d992b9f3056f281fe69259
Original commit message:
Fix CLEAR_HASH macro to be usable as a single statement.
As it is used in deflateParams().
PR-URL: https://github.com/nodejs/node/pull/11616
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
| -rw-r--r-- | deps/zlib/deflate.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/deps/zlib/deflate.c b/deps/zlib/deflate.c index 1ec761448de..909606df01f 100644 --- a/deps/zlib/deflate.c +++ b/deps/zlib/deflate.c @@ -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 |