src: fix external memory usage going negative #22594
Closed
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
nodejs-github-bot
added
c++
mafintosh
force-pushed
the
fix-negative-external-memory-usage
branch
from
f8c6a8a
to
d783377
Compare
mafintosh
changed the title
jasnell
approved these changes
Aug 30, 2018
Oliyy
approved these changes
Aug 30, 2018
TimothyGu
approved these changes
Aug 30, 2018
src/node_crypto.h
Outdated
| @@ -198,7 +198,9 @@ class SecureContext : public BaseObject { | |||
| } | |||
|
|
|||
| inline void Reset() { | |||
| env()->isolate()->AdjustAmountOfExternalAllocatedMemory(-kExternalSize); | |||
| if (ctx_.get() != nullptr) { | |||
There was a problem hiding this comment.
nit: just if (ctx_) should be enough.
cjihrig
approved these changes
Aug 30, 2018
| socket.write(yolo); | ||
| }); | ||
|
|
||
| server.listen(0, function() { |
There was a problem hiding this comment.
Please add common.mustCall() to the callback.
addaleax
approved these changes
Aug 30, 2018
BridgeAR
added
the
author ready
tniessen
approved these changes
Aug 31, 2018
|
Landed in 1287e52 |
addaleax
pushed a commit
that referenced
this pull request
Sep 2, 2018
PR-URL: #22594 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
targos
pushed a commit
that referenced
this pull request
Sep 2, 2018
PR-URL: #22594 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
targos
pushed a commit
that referenced
this pull request
Sep 3, 2018
PR-URL: #22594 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
targos
pushed a commit
that referenced
this pull request
Sep 6, 2018
PR-URL: #22594 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
This was referenced Sep 6, 2018
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.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesFixes a bug introduced in d7cba76 that decrements the external memory twice when using SSL connections (Reset is called both during destructuring and in Close).
This in turn made
process.memoryUsage().externalreport negative numbers.Added a test as well.
Fixes #21570