Changeset 2883 for box/trunk/lib

Timestamp:

27/03/2011 02:01:34 (14 months ago)

Author:

chris

Message:

Fix off-by-one errors caught by MSVC.

Location:

box/trunk/lib/common

Files:

• FdGetLine.cpp (modified) (1 diff)
• IOStreamGetLine.cpp (modified) (1 diff)

box/trunk/lib/common/FdGetLine.cpp

@@ -186 +186 @@
                         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--;

box/trunk/lib/common/IOStreamGetLine.cpp

@@ -169 +169 @@
                         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--;