nodejs
diff --git a/‎lib/internal/streams/writable.js‎
Lines changed: 3 additions & 0 deletions b/‎lib/internal/streams/writable.js‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/stream_base.cc‎
Lines changed: 1 addition & 5 deletions b/‎src/stream_base.cc‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎test/parallel/test-stream-base-typechecking.js‎
Lines changed: 0 additions & 18 deletions b/‎test/parallel/test-stream-base-typechecking.js‎
Lines changed: 0 additions & 18 deletions
diff --git a/‎test/parallel/test-stream-writable-write-error.js‎
Lines changed: 15 additions & 7 deletions b/‎test/parallel/test-stream-writable-write-error.js‎
Lines changed: 15 additions & 7 deletions
@@ -466,6 +466,9 @@ function _write(stream, chunk, encoding, cb) {
     }
 
     if (typeof chunk === 'string') {
+      if (encoding === 'buffer') {
+        throw new ERR_UNKNOWN_ENCODING(encoding);
+      }
       if ((state[kState] & kDecodeStrings) !== 0) {
         chunk = Buffer.from(chunk, encoding);
         encoding = 'buffer';
 
@@ -296,14 +296,10 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
 
 int StreamBase::WriteBuffer(const FunctionCallbackInfo<Value>& args) {
   CHECK(args[0]->IsObject());
+  CHECK(args[1]->IsUint8Array());
 
   Environment* env = Environment::GetCurrent(args);
 
-  if (!args[1]->IsUint8Array()) {
-    node::THROW_ERR_INVALID_ARG_TYPE(env, "Second argument must be a buffer");
-    return 0;
-  }
-
   Local<Object> req_wrap_obj = args[0].As<Object>();
   uv_buf_t buf;
   buf.base = Buffer::Data(args[1]);
 
@@ -31,7 +31,7 @@ function test(autoDestroy) {
   {
     const w = new Writable({
       autoDestroy,
-      _write() {}
+      write() {}
     });
     w.end();
     expectError(w, ['asd'], 'ERR_STREAM_WRITE_AFTER_END');
@@ -40,34 +40,42 @@ function test(autoDestroy) {
   {
     const w = new Writable({
       autoDestroy,
-      _write() {}
+      write() {}
     });
     w.destroy();
   }
 
   {
     const w = new Writable({
       autoDestroy,
-      _write() {}
+      write() {}
     });
     expectError(w, [null], 'ERR_STREAM_NULL_VALUES', true);
   }
 
   {
     const w = new Writable({
       autoDestroy,
-      _write() {}
+      write() {}
     });
     expectError(w, [{}], 'ERR_INVALID_ARG_TYPE', true);
   }
 
   {
     const w = new Writable({
-      decodeStrings: false,
       autoDestroy,
-      _write() {}
+      write() {}
+    });
+    expectError(w, ['asd', 'buffer'], 'ERR_UNKNOWN_ENCODING', true);
+  }
+
+  {
+    const w = new Writable({
+      autoDestroy,
+      decodeStrings: false,
+      write() {}
     });
-    expectError(w, ['asd', 'noencoding'], 'ERR_UNKNOWN_ENCODING', true);
+    expectError(w, ['asd', 'buffer'], 'ERR_UNKNOWN_ENCODING', true);
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -466,6 +466,9 @@ function _write(stream, chunk, encoding, cb) {`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`if (typeof chunk === 'string') {`
	`469`	`+ if (encoding === 'buffer') {`
	`470`	`+ throw new ERR_UNKNOWN_ENCODING(encoding);`
	`471`	`+ }`
`469`	`472`	`if ((state[kState] & kDecodeStrings) !== 0) {`
`470`	`473`	`chunk = Buffer.from(chunk, encoding);`
`471`	`474`	`encoding = 'buffer';`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function test(autoDestroy) {`
`31`	`31`	`{`
`32`	`32`	`const w = new Writable({`
`33`	`33`	`autoDestroy,`
`34`		`- _write() {}`
	`34`	`+ write() {}`
`35`	`35`	`});`
`36`	`36`	`w.end();`
`37`	`37`	`expectError(w, ['asd'], 'ERR_STREAM_WRITE_AFTER_END');`
`@@ -40,34 +40,42 @@ function test(autoDestroy) {`
`40`	`40`	`{`
`41`	`41`	`const w = new Writable({`
`42`	`42`	`autoDestroy,`
`43`		`- _write() {}`
	`43`	`+ write() {}`
`44`	`44`	`});`
`45`	`45`	`w.destroy();`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`{`
`49`	`49`	`const w = new Writable({`
`50`	`50`	`autoDestroy,`
`51`		`- _write() {}`
	`51`	`+ write() {}`
`52`	`52`	`});`
`53`	`53`	`expectError(w, [null], 'ERR_STREAM_NULL_VALUES', true);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`{`
`57`	`57`	`const w = new Writable({`
`58`	`58`	`autoDestroy,`
`59`		`- _write() {}`
	`59`	`+ write() {}`
`60`	`60`	`});`
`61`	`61`	`expectError(w, [{}], 'ERR_INVALID_ARG_TYPE', true);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`{`
`65`	`65`	`const w = new Writable({`
`66`		`- decodeStrings: false,`
`67`	`66`	`autoDestroy,`
`68`		`- _write() {}`
	`67`	`+ write() {}`
	`68`	`+ });`
	`69`	`+ expectError(w, ['asd', 'buffer'], 'ERR_UNKNOWN_ENCODING', true);`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ {`
	`73`	`+ const w = new Writable({`
	`74`	`+ autoDestroy,`
	`75`	`+ decodeStrings: false,`
	`76`	`+ write() {}`
`69`	`77`	`});`
`70`		`- expectError(w, ['asd', 'noencoding'], 'ERR_UNKNOWN_ENCODING', true);`
	`78`	`+ expectError(w, ['asd', 'buffer'], 'ERR_UNKNOWN_ENCODING', true);`
`71`	`79`	`}`
`72`	`80`	`}`
`73`	`81`