sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve an issue where the error manager could stack overflow on too many errors

pull/4/head
Paul Hollinsky 2019-03-11 13:39:41 -04:00
parent 7070368b52
commit 2fb3047c10
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/icsneocpp/errormanager.cpp
View File

@ -78,11 +78,11 @@ bool ErrorManager::enforceLimit() {
return false; return false;
bool hasTooManyWarningAlready = count_internal(ErrorFilter(APIError::TooManyErrors)) != 0; bool hasTooManyWarningAlready = count_internal(ErrorFilter(APIError::TooManyErrors)) != 0;
size_t amountToRemove = (errors.size() + (hasTooManyWarningAlready ? 0 : 1)) - errorLimit; size_t amountToRemove = (errors.size() + (hasTooManyWarningAlready ? 1 : 2)) - errorLimit;
discardLeastSevere(amountToRemove); discardLeastSevere(amountToRemove);
if(!hasTooManyWarningAlready) if(!hasTooManyWarningAlready)
add_internal(APIError::TooManyErrors); errors.emplace_back(APIError::TooManyErrors);
return true; return true;
} }
@ -95,6 +95,7 @@ APIError::Severity ErrorManager::lowestCurrentSeverity() {
while(it != errors.end()) { while(it != errors.end()) {
if((*it).getSeverity() < lowest) if((*it).getSeverity() < lowest)
lowest = (*it).getSeverity(); lowest = (*it).getSeverity();
it++;
} }
return lowest; return lowest;
} }
@ -110,6 +111,8 @@ void ErrorManager::discardLeastSevere(size_t count) {
errors.erase(it++); errors.erase(it++);
if(--count == 0) if(--count == 0)
break; break;
} else {
it++;
} }
} }
@ -121,18 +124,22 @@ void ErrorManager::discardLeastSevere(size_t count) {
errors.erase(it++); errors.erase(it++);
if(--count == 0) if(--count == 0)
break; break;
} else {
it++;
} }
} }
} }
if(count != 0) { if(count != 0) {
ErrorFilter warningFilter(APIError::Severity::Warning); ErrorFilter errorFilter(APIError::Severity::Error);
it = errors.begin(); it = errors.begin();
while(it != errors.end()) { while(it != errors.end()) {
if(warningFilter.match(*it)) { if(errorFilter.match(*it)) {
errors.erase(it++); errors.erase(it++);
if(--count == 0) if(--count == 0)
break; break;
} else {
it++;
} }
} }
} }