1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tls_wrap: slice buffer properly in ClearOut

Browse Source 
Fix incorrect slicing of cleartext buffer in `TLSWrap::ClearOut`.

Fix: https://github.com/nodejs/node/issues/4161
PR-URL: https://github.com/nodejs/node/pull/4184
Reviewed-By: Brian White <mscdex@mscdex.net>
This commit is contained in:
Fedor Indutny 2015-12-07 22:15:43 -05:00
parent 49440b7ea2
commit c0cb80ec3b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tls_wrap.cc
View File

@ -409,6 +409,7 @@ void TLSWrap::ClearOut() {
if (read <= 0) if (read <= 0)
break; break;
char* current = out;
while (read > 0) { while (read > 0) {
int avail = read; int avail = read;
@ -416,10 +417,11 @@ void TLSWrap::ClearOut() {
OnAlloc(avail, &buf); OnAlloc(avail, &buf);
if (static_cast<int>(buf.len) < avail) if (static_cast<int>(buf.len) < avail)
avail = buf.len; avail = buf.len;
memcpy(buf.base, out, avail); memcpy(buf.base, current, avail);
OnRead(avail, &buf); OnRead(avail, &buf);
read -= avail; read -= avail;
current += avail;
} }
} }

8
test/parallel/test-tls-inception.js
View File

@ -15,6 +15,8 @@ var net = require('net');
var options, a, b, portA, portB; var options, a, b, portA, portB;
var gotHello = false; var gotHello = false;
var body = new Buffer(4000).fill('A');
options = { options = {
key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')), key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem')) cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
@ -38,7 +40,7 @@ a = tls.createServer(options, function(socket) {
// the "target" server // the "target" server
b = tls.createServer(options, function(socket) { b = tls.createServer(options, function(socket) {
socket.end('hello'); socket.end(body);
}); });
process.on('exit', function() { process.on('exit', function() {
@ -59,11 +61,13 @@ a.listen(common.PORT, function() {
rejectUnauthorized: false rejectUnauthorized: false
}); });
ssl.setEncoding('utf8'); ssl.setEncoding('utf8');
var buf = '';
ssl.once('data', function(data) { ssl.once('data', function(data) {
assert.equal('hello', data); buf += data;
gotHello = true; gotHello = true;
}); });
ssl.on('end', function() { ssl.on('end', function() {
assert.equal(buf, body);
ssl.end(); ssl.end();
a.close(); a.close();
b.close(); b.close();