Skip to content

Fix crash when reading non-UTF16 files #1149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dail8859 merged 3 commits into from
Sep 26, 2026
+5 −8
Merged

Fix crash when reading non-UTF16 files #1149

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ccb000
Fix crash when reading non-UTF16 files
amirkiarafiei Sep 24, 2026
7abda88
Use persistent QStringEncoder to preserve surrogate pairs across chun…
amirkiarafiei Sep 24, 2026
bea8d41
Always instantiate QStringEncoder to UTF8
dail8859 Sep 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/ScintillaNext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,8 @@ bool ScintillaNext::readFromDisk(QFile &file)

QByteArray chunk;
qint64 bytesRead;
QStringDecoder decoder;
QStringEncoder encoder = QStringEncoder(QStringEncoder::Utf8);

bool first_read = true;
do {
Expand All @@ -694,7 +696,6 @@ bool ScintillaNext::readFromDisk(QFile &file)
// - determine space vs tabs
// - determine indentation size

QStringDecoder decoder;
int offset = 0;
if (first_read) {
first_read = false;
Expand All @@ -714,24 +715,20 @@ bool ScintillaNext::readFromDisk(QFile &file)
break;

case BomType::Utf8:
// No decoder needed if you're already passing UTF-8 to Scintilla.
// No decoder needed since Scintilla expects UTF-8.
offset = 3;
break;

default:
// Whatever your handling is for no BOM.
break;
}
}

QByteArrayView input(chunk.constData() + offset, chunk.size() - offset);

QString text = decoder(input);
QByteArray utf8 = text.toUtf8();

if (bomType == BomType::Utf16BE ||bomType == BomType::Utf16LE) {
if (bomType == BomType::Utf16BE || bomType == BomType::Utf16LE) {
QString text = decoder(input);
QByteArray utf8 = text.toUtf8();
QByteArray utf8 = encoder(text);

appendText(utf8.size(), utf8.constData());
} else {
Expand Down
Loading