zlib: check if the stream is destroyed before push (8.x) #14396
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mcollina
reviewed
Jul 20, 2017
lib/zlib.js
Outdated
| @@ -431,6 +431,11 @@ Zlib.prototype._processChunk = function _processChunk(chunk, flushFlag, cb) { | |||
| if (self._hadError) | |||
| return; | |||
|
|
|||
| if (self.destroyed) { | |||
| this.buffer = null; | |||
There was a problem hiding this comment.
I think there is no need to do this. It's done implicitly in https://github.com/Fishrock123/node/blob/9b2aee0fcea8eea690976a6ad3cb30b136ba6a67/lib/zlib.js#L426-L429
Fishrock123
force-pushed
the
v8.x-backport-aa496f4
branch
2 times, most recently
from
dea2d71
to
f1254b5
Compare
Fishrock123
force-pushed
the
v8.x-backport-aa496f4
branch
from
f1254b5
to
330f98b
Compare
If the stream is destroyed while the transform is still being applied, push() should not be called, and the internal state should be cleared. Refs: koajs/compress#60 PR-URL: nodejs#14330 Backport-PR-URL: nodejs#14396 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Conflicts: lib/zlib.js
Fishrock123
force-pushed
the
v8.x-backport-aa496f4
branch
from
330f98b
to
6fce1a3
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #14330
Conflicts:
lib/zlib.js
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesOf note, it looks like the line above should also have
buffer = nullbut perhaps that should be addressed separately.I can confirm the test works on 8.x.