Commitd63b36a

committed

Fixed long line reading from istream.

1 parent9fbe4fd commitd63b36aCopy full SHA for d63b36a

File tree

+19

-13

lines changed

+19

-13

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,13 @@`
`1`	`1`	`#Changelog`
`2`	`2`
	`3`	`+##v2.6 29.09.2022`
	`4`	`+`
	`5`	`+###Fixed`
	`6`	`+`
	`7`	`+-[issue#9](https://github.com/astand/c-coderdbc/issues/16) found by[@DPOH357](https://github.com/DPOH357)`
	`8`	`+`
	`9`	`+---`
	`10`	`+`
`3`	`11`	`##v2.5 26.07.2022`
`4`	`12`
`5`	`13`	`###Changed`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,18 @@`
`5`	`5`	`#include<assert.h>`
`6`	`6`	`#include"filewriter.h"`
`7`	`7`
`8`		`-template<size_t N =4096>`
	`8`	`+template<size_t N =10000>`
`9`	`9`	`std::string__print_loc__(constchar* format, va_list args)`
`10`	`10`	`{`
`11`		`-// TODO: make N sanitizing here to prevent memory errors`
`12`	`11`	`char work_buff[N] = {0};`
`13`	`12`	`auto ret =vsnprintf(work_buff, N, format, args);`
`14`	`13`
`15`		`-assert(ret < N);`
	`14`	`+if (ret >= N)`
	`15`	`+ {`
	`16`	`+ std::cout <<"Attention (!) the line has been shortened :" << std::endl;`
	`17`	`+ std::cout << work_buff << std::endl;`
	`18`	`+ }`
	`19`	`+`
`16`	`20`	`// make string from local array`
`17`	`21`	`return work_buff;`
`18`	`22`	`}`

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,6 @@`
`4`	`4`	`#include<math.h>`
`5`	`5`	`#include"../helpers/formatter.h"`
`6`	`6`
`7`		`-#defineMAX_LINE4096 *4`
`8`		`-`
`9`		`-char line[MAX_LINE] = {0 };`
`10`		`-`
`11`	`7`	`MessageDescriptor_tfind_message(vector<MessageDescriptor_t> msgs,uint32_t ID)`
`12`	`8`	`{`
`13`	`9`	`MessageDescriptor_t* ret =nullptr;`
`@@ -72,9 +68,8 @@ void DbcScanner::ParseMessageInfo(istream& readstrm)`
`72`	`68`
`73`	`69`	`while (readstrm.eof() ==false)`
`74`	`70`	`{`
`75`		`- readstrm.getline(line, MAX_LINE);`
`76`		`-`
`77`		`- sline =str_trim(line);`
	`71`	`+std::getline(readstrm, sline);`
	`72`	`+ sline =str_trim(sline);`
`78`	`73`
`79`	`74`	`FindVersion(sline);`
`80`	`75`
`@@ -160,9 +155,8 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)`
`160`	`155`
`161`	`156`	`while (!readstrm.eof())`
`162`	`157`	`{`
`163`		`- readstrm.getline(line, MAX_LINE);`
`164`		`-`
`165`		`- sline =str_trim(line);`
	`158`	`+std::getline(readstrm, sline);`
	`159`	`+ sline =str_trim(sline);`
`166`	`160`
`167`	`161`	`if (lparser.ParseCommentLine(&cmmnt, sline))`
`168`	`162`	`{`

Comments

(0)