src: fix external memory usage going negative

PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Mathias Buus 2018-08-30 03:23:41 +02:00 committed by Anna Henningsen
parent ec75ba6f0a
commit 1287e524ee
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
2 changed files with 38 additions and 1 deletions

View File

@ -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();

View File

@ -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();
}
}));