mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix prism error messages with multibyte truncation

Browse Source 
When a line is going to be displayed in an error message that
contains multibyte characters, we need to respect the encoding
of the source and truncate only at a character boundary, as
opposed to a raw byte boundary.

Fixes [Bug #21528]
This commit is contained in:
Kevin Newton 2025-09-12 21:13:40 -04:00
parent 4f4b4e3b37
commit d781d69a06
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
prism_compile.c
View File

@ -10627,7 +10627,26 @@ pm_parse_errors_format_line(const pm_parser_t *parser, const pm_newline_list_t *
// Here we determine if we should truncate the end of the line.
bool truncate_end = false;
if ((column_end != 0) && ((end - (start + column_end)) >= PM_ERROR_TRUNCATE)) {
end = start + column_end + PM_ERROR_TRUNCATE;
const uint8_t *end_candidate = start + column_end + PM_ERROR_TRUNCATE;
for (const uint8_t *ptr = start; ptr < end_candidate;) {
size_t char_width = parser->encoding->char_width(ptr, parser->end - ptr);
// If we failed to decode a character, then just bail out and
// truncate at the fixed width.
if (char_width == 0) break;
// If this next character would go past the end candidate,
// then we need to truncate before it.
if (ptr + char_width > end_candidate) {
end_candidate = ptr;
break;
}
ptr += char_width;
}
end = end_candidate;
truncate_end = true;
}