Skip to content

Commit

Permalink
src: fix external memory usage going negative
Browse files Browse the repository at this point in the history
PR-URL: nodejs#22594
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
  • Loading branch information
mafintosh authored and addaleax committed Sep 2, 2018
1 parent ec75ba6 commit 1287e52
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/node_crypto.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,9 @@ class SecureContext : public BaseObject {
}

inline void Reset() {
env()->isolate()->AdjustAmountOfExternalAllocatedMemory(-kExternalSize);
if (ctx_ != nullptr) {
env()->isolate()->AdjustAmountOfExternalAllocatedMemory(-kExternalSize);
}
ctx_.reset();
cert_.reset();
issuer_.reset();
Expand Down
35 changes: 35 additions & 0 deletions test/parallel/test-gc-tls-external-memory.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
'use strict';
// Flags: --expose-gc

// Tests that memoryUsage().external doesn't go negative
// when a lot tls connections are opened and closed

const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const assert = require('assert');
const net = require('net');
const tls = require('tls');

// Payload doesn't matter. We just need to have the tls
// connection try and connect somewhere.
const yolo = Buffer.alloc(10000).fill('yolo');
const server = net.createServer(function(socket) {
socket.write(yolo);
});

server.listen(0, common.mustCall(function() {
const { port } = server.address();
let runs = 0;
connect();

function connect() {
global.gc();
assert(process.memoryUsage().external >= 0);
if (runs++ < 512)
tls.connect(port).on('error', connect);
else
server.close();
}
}));

0 comments on commit 1287e52

Please sign in to comment.