Changeset 3d8702c in tol

Timestamp:

Aug 12, 2009, 5:04:58 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

bfe66f2

Parents:

d3756e3

Message:

Fixed bug in both methods BText::GetLine. When file is eof length_ is set to -1 and an invalid writting access is done at buffer_[-1]

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

File:

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

tol/bbasic/txtalgeb.cpp

@@ -1558 +1558 @@
   }
   length_ = 0;
-  BChar ch  = '\0';
+  BChar ch  = 1;
   bool untilIsLF = until=='\n';
-  for(;(length_<=maxChars)&&(ch!=until)&&(!is.eof()); length_++)
+  for(;(length_<=maxChars)&&ch&&(ch!=until)&&(!is.eof()); length_++)
   {
     is.get(ch);
@@ -1572 +1572 @@
     buffer_[length_] = ch;
   }
-  if(ch==until) { length_--; }
-  if(ch=='\0')  { length_--; }
+  if((ch==until)&&length_) { length_--; }
   buffer_[length_] = '\0';
 
@@ -1598 +1597 @@
   }
   length_ = 0;
-  BChar ch  = '\0', c;
+  BChar ch  = 1, c;
   bool untilIsLF = until=='\n';
-  for(;(length_<=maxChars)&&(ch!=until)&&(!feof(file)); length_++)
+  for(;(length_<=maxChars)&&ch&&(ch!=until)&&(!feof(file)); length_++)
   {
     ch = fgetc(file);
@@ -1612 +1611 @@
     buffer_[length_] = ch;
   }
-  if(ch==until) { length_--; }
-  if(ch=='\0')  { length_--; }
+  if((ch==until)&&length_) { length_--; }
   buffer_[length_] = '\0';
 }