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

[9.x backport] 17560, 18471, 18509 #18891

Closed
wants to merge 131 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
5ab0626
doc: add missing link references
vsemozhetbyt Jan 18, 2018
a7a712b
inspector: --inspect-brk for es modules
guybedford Jan 16, 2018
130d6f3
test: fix a bug & lint issues in inspector-helper
apapirovski Jan 22, 2018
3d7bdb4
test: fix flaky cluster unix socket test
bnoordhuis Jan 20, 2018
87648e2
test: force context allocation in test module
hashseed Jan 23, 2018
384d4e4
http: switch on string values
sethbrenith Jan 24, 2018
f4fbcf3
domain: further abstract usage in C++
apapirovski Jan 19, 2018
f86f6a7
doc: Update tools/icu/README.md
srl295 Nov 10, 2017
f48b47c
tools: fix icu readme lint error
apapirovski Jan 30, 2018
835807e
doc: warn about GCM authenticity
tniessen Jan 25, 2018
08a93ef
doc: fix manpage warnings
silverwind Jan 29, 2018
8dc159d
doc: add pending-deprecation to COLLABORATOR_GUIDE
ChALkeR Jan 29, 2018
1b7618d
doc: reorder section on updating PR branch
ofrobots Jan 24, 2018
10b3345
src: fix vector subscript out of range
apapirovski Jan 30, 2018
1c06909
url: simplify loop in parser
tniessen Jan 30, 2018
fea9f94
doc: add Gibson Fahnestock to TSC
Trott Jan 31, 2018
c8b92e2
n-api: change assert ok check to notStrictEqual.
nbdaaron Jan 27, 2018
0915a85
perf_hooks: add warning when too many entries in the timeline
jasnell Jan 10, 2018
3e6609b
doc: linkify missing types
vsemozhetbyt Jan 29, 2018
dba6652
test: move tmpdir to submodule of common
Trott Dec 25, 2017
1c9ab28
test: fix flaky test-http-dns-error
bengl Oct 26, 2017
16e918c
http: process headers after setting up agent
rvagg Oct 24, 2017
6d3862d
crypto: use non-deprecated v8::Object::Set
danbev Dec 6, 2017
f023d58
benchmark: fix platform in basename-win32
BridgeAR Jan 23, 2018
0ac2a9d
benchmark: fix variables not being set
BridgeAR Jan 23, 2018
d20e524
benchmark: (assert) refactor
BridgeAR Jan 23, 2018
4f09f08
benchmark: (buffer) refactor
BridgeAR Jan 23, 2018
3d205a3
benchmark: (crypto) refactor
BridgeAR Jan 23, 2018
10a560a
benchmark: (url) refactor
BridgeAR Jan 23, 2018
5213f8c
benchmark: (es) refactor
BridgeAR Jan 23, 2018
0d7b697
benchmark: (http(2)) refactor
BridgeAR Jan 23, 2018
bb808e3
benchmark: (timers) refactor
BridgeAR Jan 23, 2018
8aabb86
benchmark: refactor
BridgeAR Jan 23, 2018
6f2c51c
src: free memory before re-setting URLHost value
prog1dev Jan 23, 2018
3a15d71
tools: auto fix custom eslint rule
shobhitchittora Oct 31, 2017
aa90b1a
benchmark: cut down http benchmark run time
joyeecheung Jan 25, 2018
4dff070
doc: improve stream documentation
Jan 25, 2018
f939aa7
test: speed up parallel/test-tls-session-cache
addaleax Jan 29, 2018
0429820
lib: extract validation functions
timotew Jan 28, 2018
bbd2ff2
test: show pending exception error in napi tests
blairwilcox Jan 27, 2018
20f33e4
benchmark: shorten config name in http benchmark
joyeecheung Jan 30, 2018
bdd57cf
lib: remove debugger dead code
liqyan Jan 22, 2018
06051b9
src: allow --perf-(basic-)?prof in NODE_OPTIONS
Leko Dec 11, 2017
a1e45b2
deps: update node-inspect to 1.11.3
Jan 24, 2018
dfa467f
benchmark: spread operator benchmark
jasnell Jan 29, 2018
3d8db8b
test: mark test-inspector-stop-profile-after-done flaky
MylesBorins Feb 1, 2018
b2eff72
async_hooks: clean up comments
ofrobots Jan 30, 2018
a418ae5
doc: move Brian White to TSC Emeriti list
Trott Jan 31, 2018
8d37cca
stream: delete redundant code
Jan 14, 2018
524f93f
stream: delete redundant code
Jan 15, 2018
582fa6a
process: fix reading zero-length env vars on win32
addaleax Jan 30, 2018
c7f1482
v8: add missing ',' in OpenBSD's 'sources' section.
qbit Jan 30, 2018
680ca8a
build: add cflags for OpenBSD, remove stray comma.
qbit Jan 30, 2018
8621f55
doc: streamline README intro
Trott Jan 31, 2018
9a8bc9a
string_decoder: reset decoder on end
jridgewell Feb 1, 2018
fe32d68
stream: delete unused code
Jan 21, 2018
1385daf
n-api: implement wrapping using private properties
Jan 23, 2018
d737972
net: remove redundant code from _writeGeneric()
lpinca Jan 29, 2018
35d3df9
test: add test for tls benchmarks
apapirovski Feb 1, 2018
e079247
http: remove domain specific code
apapirovski Jan 29, 2018
3962051
timers: remove domain specific code
apapirovski Jan 29, 2018
c76d380
doc: remove removed apis from http2 docs
kjin Jan 29, 2018
aecc551
test: verify the shell option works properly on execFile
jvelezpo Jan 25, 2018
c573804
win, build: fix intl-none option
poiru Jan 22, 2018
7dda624
doc: improve http.request documentation
Zarel Jan 8, 2018
8e0989e
doc: shell option for the execFile and execFileSync functions
jvelezpo Jan 18, 2018
e31a6b7
build: allow x86_64 as a dest_cpu alias for x64
rvagg Jan 9, 2018
46b8481
tools: non-Ascii linter for /lib only
SirR4T Jan 8, 2018
48220ed
src, lib: return promises from link
devsnek Jan 26, 2018
9f2b4c4
tools: add .mjs linting for Windows
vsemozhetbyt Feb 4, 2018
4195f3b
test: remove destructor from node_test_fixture
danbev Feb 2, 2018
eda9456
stream: cleanup() when unpiping all streams.
Jan 20, 2018
2150e1e
n-api: wrap control flow macro in do/while
bnoordhuis Feb 2, 2018
53094da
doc: expand on promises and async_hooks
ofrobots Feb 2, 2018
1436a9c
doc: remove usage of you in n-api doc
mhdawson Feb 2, 2018
04e76b8
doc: add section for strategic initiatives
mhdawson Nov 17, 2017
75d3416
doc: small typo in n-api.md
iSkore Feb 4, 2018
701e372
n-api: add methods to open/close callback scope
mhdawson Dec 13, 2017
cf588e0
n-api: remove extra reference from test
Feb 3, 2018
b439ded
test: improve tests for test-http-url.parse
starkwang Feb 2, 2018
2d7fe3d
doc: add introduce about cli options
starkwang Jan 31, 2018
529f42c
build: add doc linting when runnning `make lint`
camilo86 Jan 31, 2018
07d39c7
doc: fix typo in n-api.md
vsemozhetbyt Feb 6, 2018
984570d
src: fix crypto.pbkdf2 callback error argument
BufoViridis Jan 30, 2018
4dd13c7
doc: modify the return value of request.write()
Feb 2, 2018
0557bec
doc: update onboarding-extras
devsnek Feb 3, 2018
f252c16
http: add options to http.createServer()
Oct 19, 2017
9de08f6
http2: add http fallback options to .createServer
hekike Oct 27, 2017
420a907
doc: fix typo in http2.md
vsemozhetbyt Feb 6, 2018
cf8c432
doc: add missing "changes" key in YAML comment
lpinca Feb 6, 2018
9aea92e
tools: add fixer for prefer-assert-iferror.js
shobhitchittora Oct 31, 2017
c230219
test: do not check TXT content in test-dns-any
joyeecheung Feb 3, 2018
298ee05
test: fix flaky test-http2-session-unref
apapirovski Feb 5, 2018
94f5e95
doc: be more explicit in the sypnosis
timotew Jan 4, 2018
fb15e3a
test: improve error message output
bshankar Feb 1, 2018
3f73b7f
readline: use Date.now() and move test to parallel
apapirovski Feb 4, 2018
f422b82
test: refactor test-http-abort-before-end
cjihrig Feb 1, 2018
ff05d54
doc: fix link in https.md
vsemozhetbyt Feb 7, 2018
67bd099
doc: fix MDN links to avoid redirections
vsemozhetbyt Feb 7, 2018
127487a
src: don't abort when package.json is a directory
bnoordhuis Jan 20, 2018
8722a0f
build: do not suppress output in make doc-only
joyeecheung Feb 1, 2018
8dc7713
stream: fix misleading error message
lpinca Feb 6, 2018
10e861c
benchmark: improve compare output
BridgeAR Feb 5, 2018
081c6ae
net: remove Socket.prototoype.read
addaleax Feb 4, 2018
59c1cfc
test: fix flaky timers-block-eventloop test
apapirovski Feb 4, 2018
85a4cec
test: properly tag anonymous namespaces
mhdawson Feb 5, 2018
27d10a5
doc: fix description of createDecipheriv
tniessen Feb 8, 2018
1d0be7c
doc: add missing meta for createCipheriv
tniessen Feb 8, 2018
dc44a2e
doc: fix links in YAML metadata of assert.md
vsemozhetbyt Feb 9, 2018
557ec07
doc: add devsnek to collaborators
devsnek Feb 9, 2018
5dbe33c
http2: add req and res options to server creation
Oct 5, 2017
ba05498
doc: fix links to Style Guide and CPP Style Guide
justin0022 Feb 9, 2018
44e4999
src: add "icu::" prefix before ICU symbols
srl295 Feb 8, 2018
f5d8a23
https: add extra options to Agent#getName()
princjef Oct 17, 2017
1462b86
src: replace var for let / const.
estrada9166 Feb 8, 2018
cd1f35d
fs: fix stack overflow in fs.readdirSync
joyeecheung Feb 8, 2018
2433c87
doc: add history for url.parse
styfle Feb 9, 2018
083c6f8
doc: fix exporting a function example
Feb 8, 2018
2bbc5dd
buffer: simplify check size in assertSize
Connormiha Feb 8, 2018
a53067c
build: no longer have v8-debug.h as dependency.
hashseed Feb 9, 2018
38451b9
doc: add error check to fs example
evanlucas Feb 9, 2018
28207e3
test: fix flaky repl-timeout-throw
santigimeno Feb 10, 2018
3bf8481
doc: mark NAPI_AUTO_LENGTH as code
tniessen Feb 10, 2018
f1ff107
url: simplify constructor URLSearchParams. Remove needless check null
Connormiha Feb 10, 2018
9da102f
async_hooks: rename PromiseWrap.parentId
ofrobots Feb 8, 2018
80cd943
tools: fix eslint isRequired
BridgeAR Feb 12, 2018
0315dd0
src: flatten ContextifyContext
devsnek Dec 9, 2017
993f943
src: factor out some common vm functions
TimothyGu Jan 13, 2018
0875753
vm: add modules
devsnek Jan 14, 2018
c401321
vm: flip Module#link's signature
devsnek Jan 31, 2018
f934e4b
loader: fix up #18394
devsnek Feb 1, 2018
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
Prev Previous commit
Next Next commit
string_decoder: reset decoder on end
This resets the StringDecoder's state after calling `#end`. Further
writes to the decoder will act as if it were a brand new instance,
allowing simple reuse.

PR-URL: #18494
Fixes: #16564
Refs: #16594
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
jridgewell authored and MylesBorins committed Feb 20, 2018
commit 9a8bc9af60c4e0616af16e8b9d70d9d7095dc5a6
15 changes: 12 additions & 3 deletions lib/string_decoder.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,11 @@ function utf8Text(buf, i) {
// character.
function utf8End(buf) {
const r = (buf && buf.length ? this.write(buf) : '');
if (this.lastNeed)
if (this.lastNeed) {
this.lastNeed = 0;
this.lastTotal = 0;
return r + '\ufffd';
}
return r;
}

Expand Down Expand Up @@ -246,6 +249,8 @@ function utf16End(buf) {
const r = (buf && buf.length ? this.write(buf) : '');
if (this.lastNeed) {
const end = this.lastTotal - this.lastNeed;
this.lastNeed = 0;
this.lastTotal = 0;
return r + this.lastChar.toString('utf16le', 0, end);
}
return r;
Expand All @@ -269,8 +274,12 @@ function base64Text(buf, i) {

function base64End(buf) {
const r = (buf && buf.length ? this.write(buf) : '');
if (this.lastNeed)
return r + this.lastChar.toString('base64', 0, 3 - this.lastNeed);
if (this.lastNeed) {
const end = 3 - this.lastNeed;
this.lastNeed = 0;
this.lastTotal = 0;
return r + this.lastChar.toString('base64', 0, end);
}
return r;
}

Expand Down
51 changes: 51 additions & 0 deletions test/parallel/test-string-decoder-end.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,46 @@ for (let i = 1; i <= 16; i++) {

encodings.forEach(testEncoding);

testEnd('utf8', Buffer.of(0xE2), Buffer.of(0x61), '\uFFFDa');
testEnd('utf8', Buffer.of(0xE2), Buffer.of(0x82), '\uFFFD\uFFFD');
testEnd('utf8', Buffer.of(0xE2), Buffer.of(0xE2), '\uFFFD\uFFFD');
testEnd('utf8', Buffer.of(0xE2, 0x82), Buffer.of(0x61), '\uFFFDa');
testEnd('utf8', Buffer.of(0xE2, 0x82), Buffer.of(0xAC), '\uFFFD\uFFFD');
testEnd('utf8', Buffer.of(0xE2, 0x82), Buffer.of(0xE2), '\uFFFD\uFFFD');
testEnd('utf8', Buffer.of(0xE2, 0x82, 0xAC), Buffer.of(0x61), '€a');

testEnd('utf16le', Buffer.of(0x3D), Buffer.of(0x61, 0x00), 'a');
testEnd('utf16le', Buffer.of(0x3D), Buffer.of(0xD8, 0x4D, 0xDC), '\u4DD8');
testEnd('utf16le', Buffer.of(0x3D, 0xD8), Buffer.of(), '\uD83D');
testEnd('utf16le', Buffer.of(0x3D, 0xD8), Buffer.of(0x61, 0x00), '\uD83Da');
testEnd(
'utf16le',
Buffer.of(0x3D, 0xD8),
Buffer.of(0x4D, 0xDC),
'\uD83D\uDC4D'
);
testEnd('utf16le', Buffer.of(0x3D, 0xD8, 0x4D), Buffer.of(), '\uD83D');
testEnd(
'utf16le',
Buffer.of(0x3D, 0xD8, 0x4D),
Buffer.of(0x61, 0x00),
'\uD83Da'
);
testEnd('utf16le', Buffer.of(0x3D, 0xD8, 0x4D), Buffer.of(0xDC), '\uD83D');
testEnd(
'utf16le',
Buffer.of(0x3D, 0xD8, 0x4D, 0xDC),
Buffer.of(0x61, 0x00),
'👍a'
);

testEnd('base64', Buffer.of(0x61), Buffer.of(), 'YQ==');
testEnd('base64', Buffer.of(0x61), Buffer.of(0x61), 'YQ==YQ==');
testEnd('base64', Buffer.of(0x61, 0x61), Buffer.of(), 'YWE=');
testEnd('base64', Buffer.of(0x61, 0x61), Buffer.of(0x61), 'YWE=YQ==');
testEnd('base64', Buffer.of(0x61, 0x61, 0x61), Buffer.of(), 'YWFh');
testEnd('base64', Buffer.of(0x61, 0x61, 0x61), Buffer.of(0x61), 'YWFhYQ==');

function testEncoding(encoding) {
bufs.forEach((buf) => {
testBuf(encoding, buf);
Expand Down Expand Up @@ -66,3 +106,14 @@ function testBuf(encoding, buf) {
assert.strictEqual(res1, res3, 'one byte at a time should match toString');
assert.strictEqual(res2, res3, 'all bytes at once should match toString');
}

function testEnd(encoding, incomplete, next, expected) {
let res = '';
const s = new SD(encoding);
res += s.write(incomplete);
res += s.end();
res += s.write(next);
res += s.end();

assert.strictEqual(res, expected);
}