Skip to content

Commit b464ae4

Browse files
authored
Merge pull request #146 from zhaozhiwen/fix/133-comment-strip-npos
Guard parseFileAndRemoveComments against a comment before the first newline
2 parents eaccfc0 + 1705a01 commit b464ae4

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

gemc/guts/gutilities.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,11 @@ string parseFileAndRemoveComments(const string& filename, const string& commentC
389389
while ((nFPos = parsedString.find(commentChars)) != string::npos) {
390390
size_t firstNL = parsedString.rfind('\n', nFPos);
391391
size_t secondNL = parsedString.find('\n', nFPos);
392-
parsedString.erase(firstNL, secondNL - firstNL);
392+
size_t eraseStart = (firstNL == string::npos) ? 0 : firstNL;
393+
size_t eraseLen = (secondNL == string::npos)
394+
? string::npos
395+
: secondNL - eraseStart;
396+
parsedString.erase(eraseStart, eraseLen);
393397
}
394398

395399
return parsedString;

0 commit comments

Comments
 (0)