Fix off-by-one errors caught by MSVC.

2 files changed, 14 insertions, 4 deletions

diff --git a/lib/common/FdGetLine.cpp b/lib/common/FdGetLine.cpp
index 9b53288b..9add2bd1 100644
--- a/lib/common/FdGetLine.cpp
+++ b/lib/common/FdGetLine.cpp
@@ -185,8 +185,13 @@ std::string FdGetLine::GetLine(bool Preprocess)
 		{
 			begin++;
 		}
-		if(!iw(r[end])) end--;
-		while(end > begin && iw(r[end]))
+
+		if(end < size && !iw(r[end]))
+		{
+			end--;
+		}
+
+		while(end > begin && end < size && iw(r[end]))
 		{
 			end--;
 		}
diff --git a/lib/common/IOStreamGetLine.cpp b/lib/common/IOStreamGetLine.cpp
index 27a77c29..3e6612cb 100644
--- a/lib/common/IOStreamGetLine.cpp
+++ b/lib/common/IOStreamGetLine.cpp
@@ -168,8 +168,13 @@ bool IOStreamGetLine::GetLine(std::string &rOutput, bool Preprocess, int Timeout
 		{
 			begin++;
 		}
-		if(!iw(r[end])) end--;
-		while(end > begin && iw(r[end]))
+
+		if(end < size && !iw(r[end]))
+		{
+			end--;
+		}
+
+		while(end > begin && end < size && iw(r[end]))
 		{
 			end--;
 		}