util: fix Latin1 decoding to return string output

PR-URL: #56222Fixes: #56219 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Daniel Lemire <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: mertcanaltin

src/encoding_binding.cc

@@ -286,9 +286,11 @@ void BindingData::DecodeLatin1(const FunctionCallbackInfo<Value>& args){
  env->isolate(), "The encoded data was not valid for encoding latin1");
  }
 
- Local<Object> buffer_result =
-node::Buffer::Copy(env, result.c_str(), written).ToLocalChecked();
- args.GetReturnValue().Set(buffer_result);
+ Local<String> output =
+String::NewFromUtf8(
+ env->isolate(), result.c_str(), v8::NewStringType::kNormal, written)
+ .ToLocalChecked();
+ args.GetReturnValue().Set(output);
 }
 
 } // namespace encoding_binding

test/cctest/test_encoding_binding.cc

@@ -26,7 +26,7 @@ bool RunDecodeLatin1(Environment* env,
 returnfalse;
  }
 
- *result = try_catch.Exception();
+ *result = args[0];
 returntrue;
 }
 
@@ -151,5 +151,26 @@ TEST_F(EncodingBindingTest, DecodeLatin1_BOMPresent){
 EXPECT_STREQ(*utf8_result, "Áéó");
 }
 
+TEST_F(EncodingBindingTest, DecodeLatin1_ReturnsString){
+ Environment* env = CreateEnvironment();
+ Isolate* isolate = env->isolate();
+ HandleScope handle_scope(isolate);
+
+constuint8_t latin1_data[] ={0xC1, 0xE9, 0xF3};
+ Local<ArrayBuffer> ab = ArrayBuffer::New(isolate, sizeof(latin1_data));
+memcpy(ab->GetBackingStore()->Data(), latin1_data, sizeof(latin1_data));
+
+ Local<Uint8Array> array = Uint8Array::New(ab, 0, sizeof(latin1_data));
+ Local<Value> args[] ={array};
+
+ Local<Value> result;
+ASSERT_TRUE(RunDecodeLatin1(env, args, false, false, &result));
+
+ASSERT_TRUE(result->IsString());
+
+ String::Utf8Value utf8_result(isolate, result);
+EXPECT_STREQ(*utf8_result, "Áéó");
+}
+
 } // namespace encoding_binding
 } // namespace node

test/parallel/test-util-text-decoder.js

@@ -0,0 +1,17 @@
+'use strict';
+
+constcommon=require('../common');
+
+consttest=require('node:test');
+constassert=require('node:assert');
+
+test('TextDecoder correctly decodes windows-1252 encoded data',{skip: !common.hasIntl},()=>{
+constlatin1Bytes=newUint8Array([0xc1,0xe9,0xf3]);
+
+constexpectedString='Áéó';
+
+constdecoder=newTextDecoder('windows-1252');
+constdecodedString=decoder.decode(latin1Bytes);
+
+assert.strictEqual(decodedString,expectedString);
+});