Skip to content

fix: bug in Scintilla's Document::ConvertLineEnds() method #5585

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
RaiKoHoff merged 1 commit into from
Mar 9, 2026
Merged

fix: bug in Scintilla's Document::ConvertLineEnds() method #5585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion language/np3_ko_kr/strings_ko_kr.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_LOADFILE """%s"" 파일을 불러오는 동안 오류가 발생하였습니다"
IDS_MUI_ERR_SAVEFILE """%s"" 파일을 저장하는 동안 오류가 발생하였습니다"
IDS_MUI_ERR_PATHNOTFOUND ""%s"의 경로는 더 이상 존재하지 않습니다.\n경로를 다시 생성하고 파일을 저장하시겠습니까?"
IDS_MUI_ERR_PATHNOTFOUND """%s""의 경로는 더 이상 존재하지 않습니다.\n경로를 다시 생성하고 파일을 저장하시겠습니까?"
IDS_MUI_ERR_DLG_FORMAT "오류 '%s', 원인:\n%s(ID:%d)\n"
IDS_MUI_ERR_BROWSE "파일 탐색기 플러그인을 찾을 수 없습니다\nMiniPath 파일 탐색기 플러그인은 https://rizonesoft.com에서 다운로드할 수 있습니다"
IDS_MUI_ERR_GREPWIN "파일 검색 플러그인을 찾을 수 없습니다\ngrepWinNP3 파일 검색 플러그인은 https://rizonesoft.com에서 다운로드할 수 있습니다"
Expand Down
6 changes: 5 additions & 1 deletion scintilla/src/Document.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1907,23 +1907,26 @@ std::string Document::TransformLineEnds(const char *s, size_t len, EndOfLine eol
void Document::ConvertLineEnds(EndOfLine eolModeSet) {
UndoGroup ug(this);

const Sci::Position length = Length();
Sci::Position length = Length();
for (Sci::Position pos = 0; pos < length; pos++) {
const char ch = cb.CharAt(pos);
if (ch == '\r') {
if (cb.CharAt(pos + 1) == '\n') {
// CRLF
if (eolModeSet == EndOfLine::Cr) {
DeleteChars(pos + 1, 1); // Delete the LF
--length;
} else if (eolModeSet == EndOfLine::Lf) {
DeleteChars(pos, 1); // Delete the CR
--length;
} else {
pos++;
}
} else {
// CR
if (eolModeSet == EndOfLine::CrLf) {
pos += InsertString(pos + 1, "\n", 1); // Insert LF
++length;
} else if (eolModeSet == EndOfLine::Lf) {
pos += InsertString(pos, "\n", 1); // Insert LF
DeleteChars(pos, 1); // Delete CR
Expand All @@ -1934,6 +1937,7 @@ void Document::ConvertLineEnds(EndOfLine eolModeSet) {
// LF
if (eolModeSet == EndOfLine::CrLf) {
pos += InsertString(pos, "\r", 1); // Insert CR
++length;
} else if (eolModeSet == EndOfLine::Cr) {
pos += InsertString(pos, "\r", 1); // Insert CR
DeleteChars(pos, 1); // Delete LF
Expand Down