Skip to content

Commit 82cea61

Browse files
committed
fix: guard against empty string crash in parser() and bounds check in read_FM/read_SM
1 parent 3b6756b commit 82cea61

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

concore.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ class Concore{
240240
*/
241241
vector<double> parser(string f){
242242
vector<double> temp;
243+
if(f.empty()) return temp;
243244
string value = "";
244245

245246
//Changing last bracket to comma to use comma as a delimiter
@@ -330,6 +331,10 @@ class Concore{
330331
s += ins;
331332

332333
vector<double> inval = parser(ins);
334+
if(inval.empty())
335+
inval = parser(initstr);
336+
if(inval.empty())
337+
return inval;
333338
simtime = simtime > inval[0] ? simtime : inval[0];
334339

335340
//returning a string with data excluding simtime
@@ -389,6 +394,10 @@ class Concore{
389394
s += ins;
390395

391396
vector<double> inval = parser(ins);
397+
if(inval.empty())
398+
inval = parser(initstr);
399+
if(inval.empty())
400+
return inval;
392401
simtime = simtime > inval[0] ? simtime : inval[0];
393402

394403
//returning a string with data excluding simtime

0 commit comments

Comments
 (0)