Changeset 7e0204a in tol

Timestamp:

Aug 18, 2009, 10:14:13 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

380534f1

Parents:

57617ab

Message:

Fixes #726

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1227 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bbasic/txtalgeb.cpp (modified) (2 diffs)

tol/bbasic/txtalgeb.cpp

@@ -1558 +1558 @@
   }
   length_ = 0;
-  BChar ch  = 1;
+  BChar ch  = 0;
   bool untilIsLF = until=='\n';
-  for(;(length_<=maxChars)&&ch&&(ch!=until)&&(!is.eof()); length_++)
+  for(;(length_<=maxChars)&&(ch!=until)&&(!is.eof()); length_++)
   {
     is.get(ch);
+    if(!ch) { break; }
 #   ifdef READ_CRLF_AS_LF
     if(untilIsLF && (ch == '\r')&&(!is.eof()))
@@ -1597 +1598 @@
   }
   length_ = 0;
-  BChar ch  = 1, c;
+  BChar ch  = 0, c;
   bool untilIsLF = until=='\n';
-  for(;(length_<=maxChars)&&ch&&(ch!=until)&&(!feof(file)); length_++)
+  for(;(length_<=maxChars)&&(ch!=until)&&(!feof(file)); length_++)
   {
     ch = fgetc(file);
+    if(!ch) { break; }
 #   ifdef READ_CRLF_AS_LF
     if(untilIsLF && (ch == '\r')&&(!feof(file)))