Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

js_stream: fix buffer index in DoWrite #1635

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/js_stream.cc
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ int JSStream::DoWrite(WriteWrap* w,

Local<Array> bufs_arr = Array::New(env()->isolate(), count);
for (size_t i = 0; i < count; i++)
bufs_arr->Set(i, Buffer::New(env(), bufs[0].base, bufs[0].len));
bufs_arr->Set(i, Buffer::New(env(), bufs[i].base, bufs[i].len));

Local<Value> argv[] = {
w->object(),
Expand Down
65 changes: 65 additions & 0 deletions test/parallel/test-tls-connect-stream-writes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
var assert = require('assert'),
fs = require('fs'),
path = require('path'),
tls = require('tls'),
stream = require('stream'),
net = require('net');

var common = require('../common');

var server;
var cert_dir = path.resolve(__dirname, '../fixtures'),
options = { key: fs.readFileSync(cert_dir + '/test_key.pem'),
cert: fs.readFileSync(cert_dir + '/test_cert.pem'),
ca: [ fs.readFileSync(cert_dir + '/test_ca.pem') ],
ciphers: 'AES256-GCM-SHA384' };
var content = 'hello world';
var recv_bufs = [];
var send_data = '';
server = tls.createServer(options, function(s) {
s.on('data', function(c) {
recv_bufs.push(c);
});
});
server.listen(common.PORT, function() {
var raw = net.connect(common.PORT);

var pending = false;
raw.on('readable', function() {
if (pending)
p._read();
});

var p = new stream.Duplex({
read: function read() {
pending = false;

var chunk = raw.read();
if (chunk) {
this.push(chunk);
} else {
pending = true;
}
},
write: function write(data, enc, cb) {
raw.write(data, enc, cb);
}
});

var socket = tls.connect({
socket: p,
rejectUnauthorized: false
}, function() {
for (var i = 0; i < 50; ++i) {
socket.write(content);
send_data += content;
}
socket.end();
server.close();
});
});

process.on('exit', function() {
var recv_data = (Buffer.concat(recv_bufs)).toString();
assert.strictEqual(send_data, recv_data);
});