SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

LibShell: Stop reading error source text directly from the source file

Browse Source 
Use the saved source text instead of trying to read it directly from the
source file, as the source file may be a relative path and the script
could have changed the current working directory which would make the
path invalid.
This commit is contained in:
Eduardo Casadei authored and Lucas Chollet committed 2026-11-02 09:33:46 +01:00
1 parent 47b533f8d8
commit 78085e276d
1 file changed
+1 -33
Download Patch File Download Diff File Expand all files Collapse all files
Userland/Libraries/LibShell/Shell.cpp
+1 -33
View File
@@ -2567,39 +2567,7 @@ void Shell::possibly_print_error() const
StringView current_line;
i64 line_to_skip_to = max(source_position.position->start_line.line_number, 2ul) - 2;
if (source_position.source_file.has_value()) {
auto file_or_error = Core::File::open(*source_position.source_file, Core::File::OpenMode::Read);
if (file_or_error.is_error()) {
warnln("Shell: Internal error while trying to display source information: {} (while reading '{}')", file_or_error.error(), *source_position.source_file);
return;
}
auto file = Core::InputBufferedFile::create(file_or_error.release_value());
while (line < line_to_skip_to) {
if (file.value()->is_eof())
return;
auto current_line_or_error = file.value()->read_line(line_buf);
if (current_line_or_error.is_error()) {
warnln("Shell: Internal error while trying to display source information: {} (while reading line {} of '{}')", current_line_or_error.error(), line, source_position.source_file);
return;
}
current_line = current_line_or_error.release_value();
++line;
}
for (; line < (i64)source_position.position->end_line.line_number + 2; ++line) {
do_line(line, current_line);
if (file.value()->is_eof()) {
current_line = ""sv;
} else {
auto current_line_or_error = file.value()->read_line(line_buf);
if (current_line_or_error.is_error()) {
warnln("Shell: Internal error while trying to display source information: {} (while reading line {} of '{}')", current_line_or_error.error(), line, source_position.source_file);
return;
}
current_line = current_line_or_error.release_value();
}
}
} else if (!source_position.literal_source_text.is_empty()) {
if (!source_position.literal_source_text.is_empty()) {
GenericLexer lexer { source_position.literal_source_text };
while (line < line_to_skip_to) {
if (lexer.is_eof())