fix buffer.transcode if both encodings are same

cloudflare · Aug 24, 2024 · 18045db · 18045db
1 parent 537c806
commit 18045db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/workerd/api/node/i18n.c++ b/src/workerd/api/node/i18n.c++
@@ -215,14 +215,6 @@ void Converter::setSubstituteChars(kj::StringPtr sub) {
 
 kj::Array<kj::byte> transcode(
     kj::ArrayPtr<kj::byte> source, Encoding fromEncoding, Encoding toEncoding) {
-  // Optimization:
-  // If both encodings are same, we just return a copy of the buffer.
-  if (fromEncoding == toEncoding) {
-    auto destbuf = kj::heapArray<kj::byte>(source.size());
-    destbuf.asPtr().copyFrom(source);
-    return destbuf.asBytes().attach(kj::mv(destbuf));
-  }
-
   TranscodeImpl transcode_function = &TranscodeDefault;
   switch (fromEncoding) {
     case Encoding::ASCII:

diff --git a/src/workerd/api/node/tests/buffer-nodejs-test.js b/src/workerd/api/node/tests/buffer-nodejs-test.js
@@ -6045,6 +6045,13 @@ export const transcodeTest = {
       ok(copied_value.buffer.detached);
       ok(!original.buffer.detached);
     }
+
+    // Same encoding types should return in a value that replaces
+    // invalid characters with replacement characters.
+    deepStrictEqual(
+      transcode(Buffer.from([0x80]), 'utf8', 'utf8'),
+      Buffer.from([0xef, 0xbf, 0xbd])
+    );
   },
 };