RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 16:22:43 +00:00
Code Issues Activity Actions

js: Convert non-UTF-8 encoded files to UTF-8 before parsing

Browse source
This commit is contained in:
Timothy Flynn 2022-04-03 09:31:04 -04:00 • committed by Linus Groh
parent 9e5abec6f1
commit b36c3a68d8
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/js.cpp
View file

@ -71,6 +71,7 @@
#include <LibJS/SourceTextModule.h>
#include <LibLine/Editor.h>
#include <LibMain/Main.h>
#include <LibTextCodec/Decoder.h>
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
@ -1653,7 +1654,16 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly));
auto file_contents = file->read_all();
auto source = StringView { file_contents };
builder.append(source);
if (Utf8View { file_contents }.validate()) {
builder.append(source);
} else {
auto* decoder = TextCodec::decoder_for("windows-1252");
VERIFY(decoder);
auto utf8_source = TextCodec::convert_input_to_utf8_using_given_decoder_unless_there_is_a_byte_order_mark(*decoder, source);
builder.append(utf8_source);
}
}
source_name = script_paths[0];