diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-03-20 21:18:10 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-03-20 21:18:25 +0100 |
| commit | a157ae70831fd23d0c27f118d108d7f13bce3b45 (patch) | |
| tree | ae65d3dbfff9ef416e94e49a22d1a826d95a9e0c /cpp/src/Ice/ConnectionI.cpp | |
| parent | Run JavaScript es6 test suite with Edge (diff) | |
| download | ice-a157ae70831fd23d0c27f118d108d7f13bce3b45.tar.bz2 ice-a157ae70831fd23d0c27f118d108d7f13bce3b45.tar.xz ice-a157ae70831fd23d0c27f118d108d7f13bce3b45.zip | |
Added sanity checks for ACM timeout value (ICE-8749)
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index d584d6ccd44..1f3bb85464c 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1147,6 +1147,14 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout, const IceUtil::Optional<Ice::ACMHeartbeat>& heartbeat) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); + if(timeout && *timeout < 0) + { +#ifdef ICE_CPP11_MAPPING + throw invalid_argument("invalid negative ACM timeout value"); +#else + throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "invalid negative ACM timeout value"); +#endif + } if(!_monitor || _state >= StateClosed) { return; |