stream: disallow writing string chunk with 'buffer' encoding

Signed-off-by: Renegade334 <contact.9a5d6388@renegade334.me.uk>
PR-URL: #63062
Refs: #33075
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Author: Renegade334

lib/internal/streams/writable.js

@@ -466,6 +466,9 @@ function _write(stream, chunk, encoding, cb) {
 }
 
 if(typeofchunk==='string'){
+if(encoding==='buffer'){
+thrownewERR_UNKNOWN_ENCODING(encoding);
+}
 if((state[kState]&kDecodeStrings)!==0){
 chunk=Buffer.from(chunk,encoding);
 encoding='buffer';

src/stream_base.cc

@@ -296,14 +296,10 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
 
 intStreamBase::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");
-return0;
- }
-
  Local<Object> req_wrap_obj = args[0].As<Object>();
 uv_buf_t buf;
  buf.base = Buffer::Data(args[1]);

test/parallel/test-stream-base-typechecking.js

@@ -31,7 +31,7 @@ function test(autoDestroy) {
 {
 constw=newWritable({
  autoDestroy,
-_write(){}
+write(){}
 });
 w.end();
 expectError(w,['asd'],'ERR_STREAM_WRITE_AFTER_END');
@@ -40,34 +40,42 @@ function test(autoDestroy) {
 {
 constw=newWritable({
  autoDestroy,
-_write(){}
+write(){}
 });
 w.destroy();
 }
 
 {
 constw=newWritable({
  autoDestroy,
-_write(){}
+write(){}
 });
 expectError(w,[null],'ERR_STREAM_NULL_VALUES',true);
 }
 
 {
 constw=newWritable({
  autoDestroy,
-_write(){}
+write(){}
 });
 expectError(w,[{}],'ERR_INVALID_ARG_TYPE',true);
 }
 
 {
 constw=newWritable({
-decodeStrings: false,
  autoDestroy,
-_write(){}
+write(){}
+});
+expectError(w,['asd','buffer'],'ERR_UNKNOWN_ENCODING',true);
+}
+
+{
+constw=newWritable({
+ autoDestroy,
+decodeStrings: false,
+write(){}
 });
-expectError(w,['asd','noencoding'],'ERR_UNKNOWN_ENCODING',true);
+expectError(w,['asd','buffer'],'ERR_UNKNOWN_ENCODING',true);
 }
 }