nodejs
diff --git a/‎src/node_i18n.cc‎
Lines changed: 5 additions & 1 deletion b/‎src/node_i18n.cc‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎test/parallel/test-whatwg-encoding-custom-textdecoder.js‎
Lines changed: 7 additions & 0 deletions b/‎test/parallel/test-whatwg-encoding-custom-textdecoder.js‎
Lines changed: 7 additions & 0 deletions
@@ -425,7 +425,11 @@ void ConverterObject::Create(const FunctionCallbackInfo<Value>& args) {
                         nullptr, nullptr, nullptr, &status);
   }
 
-  new ConverterObject(env, obj, conv, flags);
+  auto converter = new ConverterObject(env, obj, conv, flags);
+  size_t sublen = ucnv_getMinCharSize(conv);
+  std::string sub(sublen, '?');
+  converter->set_subst_chars(sub.c_str());
+
   args.GetReturnValue().Set(obj);
 }
 
 
@@ -199,3 +199,10 @@ if (common.hasIntl) {
   const str = decoder.decode(chunk);
   assert.strictEqual(str, 'foo\ufffd');
 }
+
+if (common.hasIntl) {
+  const decoder = new TextDecoder('Shift_JIS');
+  const chunk = new Uint8Array([-1]);
+  const str = decoder.decode(chunk);
+  assert.strictEqual(str, '\ufffd');
+}
Original file line number	Diff line number	Diff line change
@@ -425,7 +425,11 @@ void ConverterObject::Create(const FunctionCallbackInfo<Value>& args) {
425	425	nullptr, nullptr, nullptr, &status);
426	426	}
427	427
428		- new ConverterObject(env, obj, conv, flags);
	428	+ auto converter = new ConverterObject(env, obj, conv, flags);
	429	+ size_t sublen = ucnv_getMinCharSize(conv);
	430	+ std::string sub(sublen, '?');
	431	+ converter->set_subst_chars(sub.c_str());
	432	+
429	433	args.GetReturnValue().Set(obj);
430	434	}
431	435