Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/elfmz/far2l.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShmuel Zeigerman <solomuz0@gmail.com>2022-03-31 11:01:46 +0300
committerShmuel Zeigerman <solomuz0@gmail.com>2022-03-31 11:01:46 +0300
commit4b81e755003252737112d38f49d5016ab92b02ea (patch)
tree906944f5bffe637cdc513d86ed478526904b578f /far2l/src/fileedit.cpp
parent401f0cefbdf5ed407acc46372ab9005c51611e0e (diff)
Complete the ECTL_SAVEFILE fix
Diffstat (limited to 'far2l/src/fileedit.cpp')
-rw-r--r--far2l/src/fileedit.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/far2l/src/fileedit.cpp b/far2l/src/fileedit.cpp
index 1bd28b17..72021e5f 100644
--- a/far2l/src/fileedit.cpp
+++ b/far2l/src/fileedit.cpp
@@ -1932,7 +1932,9 @@ int FileEditor::SaveFile(const wchar_t *Name,int Ask, bool bSaveAs, int TextForm
if (TextFormat&&*EndSeq)
EndSeq=m_editor->GlobalEOL;
- WINPORT(WideCharToMultiByte)(codepage,WC_NO_BEST_FIT_CHARS,EndSeq,StrLength(EndSeq),nullptr,0,nullptr,&UsedDefaultCharEOL);
+ int EndSeqLen = StrLength(EndSeq);
+ if (EndSeqLen && !WINPORT(WideCharToMultiByte)(codepage,WC_NO_BEST_FIT_CHARS,EndSeq,EndSeqLen,nullptr,0,nullptr,&UsedDefaultCharEOL))
+ return SAVEFILE_ERROR;
if (!BadSaveConfirmed && (UsedDefaultCharStr||UsedDefaultCharEOL))
{