IniFile: don't lose last character if the file doesn't end with \r\n

ksmyth · binarymaster · commit a5c64a43319e · 2018-12-20T18:50:35.000+03:00
diff --git a/src-x86-x64-Fusix/IniFile.cpp b/src-x86-x64-Fusix/IniFile.cpp
@@ -127,7 +127,12 @@ DWORD INI_FILE::GetFileStringFromNum(DWORD StringNumber, char *RetString, DWORD
 
 	for (DWORD i = FileStringsMap[StringNumber]; i < FileSize; i++)
 	{
-		if ((FileRaw[i] == '\r' && FileRaw[i + 1] == '\n') || i == (FileSize - 1))
+		if (i == (FileSize - 1))
+		{
+			EndStringPos = FileSize;
+			break;
+		}
+		if (FileRaw[i] == '\r' && FileRaw[i + 1] == '\n')
 		{
 			EndStringPos = i;
 			break;

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,12 @@ DWORD INI_FILE::GetFileStringFromNum(DWORD StringNumber, char *RetString, DWORD`
`127`	`127`
`128`	`128`	`for (DWORD i = FileStringsMap[StringNumber]; i < FileSize; i++)`
`129`	`129`	`{`
`130`		`- if ((FileRaw[i] == '\r' && FileRaw[i + 1] == '\n') \|\| i == (FileSize - 1))`
	`130`	`+ if (i == (FileSize - 1))`
	`131`	`+ {`
	`132`	`+ EndStringPos = FileSize;`
	`133`	`+ break;`
	`134`	`+ }`
	`135`	`+ if (FileRaw[i] == '\r' && FileRaw[i + 1] == '\n')`
`131`	`136`	`{`
`132`	`137`	`EndStringPos = i;`
`133`	`138`	`break;`