diff --git a/contributors.txt b/contributors.txt index 64699a54d..caf196135 100644 --- a/contributors.txt +++ b/contributors.txt @@ -166,4 +166,5 @@ YYYY/MM/DD, github id, Full name, email 2017/09/11, sachinjain024, Sachin Jain, sachinjain024@gmail.com 2017/10/06, bramp, Andrew Brampton, brampton@gmail.com 2017/10/15, simkimsia, Sim Kim Sia, kimcity@gmail.com -2017/05/29, rlfnb, Ralf Neeb, rlfnb@rlfnb.de +2017/10/27, Griffon26, Maurice van der Pot, griffon26@kfk4ever.com +2017/05/29, rlfnb, Ralf Neeb, rlfnb@rlfnb.de \ No newline at end of file diff --git a/runtime/Cpp/runtime/src/atn/LexerActionExecutor.cpp b/runtime/Cpp/runtime/src/atn/LexerActionExecutor.cpp index c9c32f074..1ae510f75 100755 --- a/runtime/Cpp/runtime/src/atn/LexerActionExecutor.cpp +++ b/runtime/Cpp/runtime/src/atn/LexerActionExecutor.cpp @@ -101,7 +101,7 @@ size_t LexerActionExecutor::generateHashCode() const { for (auto lexerAction : _lexerActions) { hash = MurmurHash::update(hash, lexerAction); } - MurmurHash::finish(hash, _lexerActions.size()); + hash = MurmurHash::finish(hash, _lexerActions.size()); return hash; } diff --git a/runtime/Cpp/runtime/src/misc/IntervalSet.cpp b/runtime/Cpp/runtime/src/misc/IntervalSet.cpp index ab4d240cc..b76409405 100755 --- a/runtime/Cpp/runtime/src/misc/IntervalSet.cpp +++ b/runtime/Cpp/runtime/src/misc/IntervalSet.cpp @@ -44,6 +44,8 @@ IntervalSet::IntervalSet(int n, ...) : IntervalSet() { for (int i = 0; i < n; i++) { add(va_arg(vlist, int)); } + + va_end(vlist); } IntervalSet::~IntervalSet()