walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Throw exception in getVariableFromVarId() if called with out_of_range varId 

That way we have a chance to catch code bugs at all.
This commit is contained in:
Thomas Jarosch 2015-01-15 18:52:11 +01:00
parent 20aea9deb3
commit 08985bf68a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/symboldatabase.h
View File

@ -968,10 +968,7 @@ public:
} }
const Variable *getVariableFromVarId(std::size_t varId) const { const Variable *getVariableFromVarId(std::size_t varId) const {
if (varId >= _variableList.size()) return _variableList.at(varId);
return nullptr;
return _variableList[varId];
} }
std::size_t getVariableListSize() const { std::size_t getVariableListSize() const {

4
test/testsymboldatabase.cpp
View File

@ -20,6 +20,7 @@
#include "testutils.h" #include "testutils.h"
#include "symboldatabase.h" #include "symboldatabase.h"
#include <sstream> #include <sstream>
#include <stdexcept>
#define GET_SYMBOL_DB(code) \ #define GET_SYMBOL_DB(code) \
errout.str(""); \ errout.str(""); \
@ -759,8 +760,7 @@ private:
// three elements: varId 0 also counts via a fake-entry // three elements: varId 0 also counts via a fake-entry
ASSERT(v && db->getVariableListSize() == 3); ASSERT(v && db->getVariableListSize() == 3);
const Variable* v_must_be_null = db->getVariableFromVarId(3); ASSERT_THROW(db->getVariableFromVarId(3), std::out_of_range);
ASSERT(v_must_be_null == nullptr);
} }
void hasRegularFunction() { void hasRegularFunction() {