nodejs
diff --git a/Collapse file
‎src/node_i18n.cc‎
Copy file name to clipboardExpand all lines: src/node_i18n.cc
+12-2Lines changed: 12 additions & 2 deletions b/Collapse file
‎src/node_i18n.cc‎
Copy file name to clipboardExpand all lines: src/node_i18n.cc
+12-2Lines changed: 12 additions & 2 deletions
diff --git a/Collapse file
‎test/parallel/test-icu-transcode.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-icu-transcode.js
+5Lines changed: 5 additions & 0 deletions b/Collapse file
‎test/parallel/test-icu-transcode.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-icu-transcode.js
+5Lines changed: 5 additions & 0 deletions
@@ -148,8 +148,13 @@ MaybeLocal<Object> Transcode(Environment* env,
   *status = U_ZERO_ERROR;
   MaybeLocal<Object> ret;
   MaybeStackBuffer<char> result;
-  Converter to(toEncoding, "?");
+  Converter to(toEncoding);
   Converter from(fromEncoding);
+
+  size_t sublen = ucnv_getMinCharSize(to.conv());
+  std::string sub(sublen, '?');
+  to.set_subst_chars(sub.c_str());
+
   const uint32_t limit = source_length * to.max_char_size();
   result.AllocateSufficientStorage(limit);
   char* target = *result;
@@ -190,7 +195,12 @@ MaybeLocal<Object> TranscodeFromUcs2(Environment* env,
   *status = U_ZERO_ERROR;
   MaybeStackBuffer<UChar> sourcebuf;
   MaybeLocal<Object> ret;
-  Converter to(toEncoding, "?");
+  Converter to(toEncoding);
+
+  size_t sublen = ucnv_getMinCharSize(to.conv());
+  std::string sub(sublen, '?');
+  to.set_subst_chars(sub.c_str());
+
   const size_t length_in_chars = source_length / sizeof(UChar);
   CopySourceBuffer(&sourcebuf, source, source_length, length_in_chars);
   MaybeStackBuffer<char> destbuf(length_in_chars);
 
@@ -83,3 +83,8 @@ assert.deepStrictEqual(
   const dest = buffer.transcode(new Uint8Array(), 'utf8', 'latin1');
   assert.strictEqual(dest.length, 0);
 }
+
+// Test that it doesn't crash
+{
+  buffer.transcode(new buffer.SlowBuffer(1), 'utf16le', 'ucs2');
+}