Fixed long line reading from istream.

astand · astand · commit d63b36a2280e · 2022-09-29T22:47:15.000+03:00
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## v2.6 29.09.2022
+
+### Fixed
+
+- [issue #9](https://github.com/astand/c-coderdbc/issues/16) found by [@DPOH357](https://github.com/DPOH357)
+
+---
+
 ## v2.5 26.07.2022
 
 ### Changed
diff --git a/src/codegen/filewriter.cpp b/src/codegen/filewriter.cpp
@@ -5,14 +5,18 @@
 #include <assert.h>
 #include "filewriter.h"
 
-template<size_t N = 4096>
+template<size_t N = 10000>
 std::string __print_loc__(const char* format, va_list args)
 {
-  // TODO: make N sanitizing here to prevent memory errors
   char work_buff[N] = {0};
   auto ret = vsnprintf(work_buff, N, format, args);
 
-  assert(ret < N);
+  if (ret >= N)
+  {
+    std::cout << "Attention (!) the line has been shortened : " << std::endl;
+    std::cout << work_buff << std::endl;
+  }
+
   // make string from local array
   return work_buff;
 }
diff --git a/src/parser/dbcscanner.cpp b/src/parser/dbcscanner.cpp
@@ -4,10 +4,6 @@
 #include <math.h>
 #include "../helpers/formatter.h"
 
-#define MAX_LINE 4096 * 4
-
-char line[MAX_LINE] = { 0 };
-
 MessageDescriptor_t* find_message(vector<MessageDescriptor_t*> msgs, uint32_t ID)
 {
   MessageDescriptor_t* ret = nullptr;
@@ -72,9 +68,8 @@ void DbcScanner::ParseMessageInfo(istream& readstrm)
 
   while (readstrm.eof() == false)
   {
-    readstrm.getline(line, MAX_LINE);
-
-    sline = str_trim(line);
+    std::getline(readstrm, sline);
+    sline = str_trim(sline);
 
     FindVersion(sline);
 
@@ -160,9 +155,8 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
 
   while (!readstrm.eof())
   {
-    readstrm.getline(line, MAX_LINE);
-
-    sline = str_trim(line);
+    std::getline(readstrm, sline);
+    sline = str_trim(sline);
 
     if (lparser.ParseCommentLine(&cmmnt, sline))
     {
