Fixed potentially crash in config writer

70ab15e3 · D-AIRY · 3283d180 · 70ab15e3
Commit 70ab15e3 authored Dec 19, 2018 by D-AIRY
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Config.cpp source/core/Config.cpp +3 -3

No files found.
--- a/source/core/Config.cpp
+++ b/source/core/Config.cpp
@@ -605,7 +605,7 @@ int CConfig::writeFile(const CConfigString & name, CConfigString section, CConfi
 							break;
 						}
 					}
-					while(szData[i] == '\r' || szData[i] == '\n')
+					while(i < fl && (szData[i] == '\r' || szData[i] == '\n'))
 					{
 						++i;
 					}
@@ -620,7 +620,7 @@ int CConfig::writeFile(const CConfigString & name, CConfigString section, CConfi
 							se = true;
 							break;
 						}
-						while((szData[i] == ' ' || szData[i] == '\t') && i < fl)
+						while(i < fl && (szData[i] == ' ' || szData[i] == '\t'))
 						{
 							++i;
 						}
@@ -674,7 +674,7 @@ int CConfig::writeFile(const CConfigString & name, CConfigString section, CConfi
 									break;
 								}
 							}
-							while(szData[i] == '\r' || szData[i] == '\n')
+							while(i < fl && (szData[i] == '\r' || szData[i] == '\n'))
 							{
 								++i;
 							}