far2l code only checked for errors when transcoding a string if the output string had zero length. This is incorrect: during transcoding, not the entire string, but only part of it could be lost, and such cases were not treated as transcoding errors. This commit fixes that.

1 files changed, 9 insertions, 9 deletions

diff --git a/far2l/src/filestr.cpp b/far2l/src/filestr.cpp
index d96620e6..0ff255ee 100644
--- a/far2l/src/filestr.cpp
+++ b/far2l/src/filestr.cpp
@@ -104,13 +104,13 @@ int OldGetFileString::GetString(wchar_t **DestStr, int nCodePage, int &Length)
 				                    (SomeDataLost || nCodePage==CP_UTF7) ? 0 : MB_ERR_INVALID_CHARS,
 				                    Str, Length, wStr, m_nwStrLength - 1);
 
-				if (!nResultLength)
-				{
-					ret = WINPORT(GetLastError)();
+				ret = WINPORT(GetLastError)();
 
-					if (ERROR_NO_UNICODE_TRANSLATION == ret)
+				if (ERROR_NO_UNICODE_TRANSLATION == ret)
+				{
+					SomeDataLost = true;
+					if (!nResultLength)
 					{
-						SomeDataLost = true;
 						bGet = true;
 					}
 				}
@@ -789,12 +789,12 @@ int GetFileString::GetString(LPWSTR* DestStr, UINT nCodePage, int& Length)
 				(context.SomeDataLost || nCodePage==CP_UTF7) ? 0 : MB_ERR_INVALID_CHARS, 
 				Str, Length, &Buffer[0], Buffer.size()-1);
 
-			if (!nResultLength)
+			Result = WINPORT(GetLastError)();
+			if (Result == ERROR_NO_UNICODE_TRANSLATION)
 			{
-				Result = WINPORT(GetLastError)();
-				if (Result == ERROR_NO_UNICODE_TRANSLATION)
+				context.SomeDataLost = true;
+				if (!nResultLength)
 				{
-					context.SomeDataLost = true;
 					bGet = true;
 				}
 			}