Skip to content

Commit 6ccbe75

Browse files
Shigeki Ohtsuindutny
Shigeki Ohtsu
authored andcommitted
js_stream: fix buffer index in DoWrite
The index of buffer to write in JSStream was always 0 by mistake. This fix was to use increment index of buffer arrays. The test was originally made by Brian White in #1594. Fix: #1595 Fix: #1594 PR-URL: #1635 Reviewed-By: Fedor Indutny <[email protected]>
1 parent b712af7 commit 6ccbe75

File tree

2 files changed

+66
-1
lines changed

2 files changed

+66
-1
lines changed

src/js_stream.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ int JSStream::DoWrite(WriteWrap* w,
8989

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

9494
Local<Value> argv[] = {
9595
w->object(),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
var assert = require('assert'),
2+
fs = require('fs'),
3+
path = require('path'),
4+
tls = require('tls'),
5+
stream = require('stream'),
6+
net = require('net');
7+
8+
var common = require('../common');
9+
10+
var server;
11+
var cert_dir = path.resolve(__dirname, '../fixtures'),
12+
options = { key: fs.readFileSync(cert_dir + '/test_key.pem'),
13+
cert: fs.readFileSync(cert_dir + '/test_cert.pem'),
14+
ca: [ fs.readFileSync(cert_dir + '/test_ca.pem') ],
15+
ciphers: 'AES256-GCM-SHA384' };
16+
var content = 'hello world';
17+
var recv_bufs = [];
18+
var send_data = '';
19+
server = tls.createServer(options, function(s) {
20+
s.on('data', function(c) {
21+
recv_bufs.push(c);
22+
});
23+
});
24+
server.listen(common.PORT, function() {
25+
var raw = net.connect(common.PORT);
26+
27+
var pending = false;
28+
raw.on('readable', function() {
29+
if (pending)
30+
p._read();
31+
});
32+
33+
var p = new stream.Duplex({
34+
read: function read() {
35+
pending = false;
36+
37+
var chunk = raw.read();
38+
if (chunk) {
39+
this.push(chunk);
40+
} else {
41+
pending = true;
42+
}
43+
},
44+
write: function write(data, enc, cb) {
45+
raw.write(data, enc, cb);
46+
}
47+
});
48+
49+
var socket = tls.connect({
50+
socket: p,
51+
rejectUnauthorized: false
52+
}, function() {
53+
for (var i = 0; i < 50; ++i) {
54+
socket.write(content);
55+
send_data += content;
56+
}
57+
socket.end();
58+
server.close();
59+
});
60+
});
61+
62+
process.on('exit', function() {
63+
var recv_data = (Buffer.concat(recv_bufs)).toString();
64+
assert.strictEqual(send_data, recv_data);
65+
});

0 commit comments

Comments
 (0)