From d5b4c4091ce634d8e99ab0150acd853bd209df2a Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Thu, 20 Feb 2020 12:45:29 +0100 Subject: Fixed invalid access to _instance in RetryQueue, fixes #681 --- cpp/src/Ice/RetryQueue.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cpp/src/Ice/RetryQueue.cpp') diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp index 8f9694416fd..b52a6b59fc9 100644 --- a/cpp/src/Ice/RetryQueue.cpp +++ b/cpp/src/Ice/RetryQueue.cpp @@ -144,11 +144,14 @@ IceInternal::RetryQueue::cancel(const RetryTaskPtr& task) Lock sync(*this); if(_requests.erase(task) > 0) { - if(!_instance && _requests.empty()) + if(_instance) + { + return _instance->timer()->cancel(task); + } + else if(_requests.empty()) { notify(); // If we are destroying the queue, destroy is probably waiting on the queue to be empty. } - return _instance->timer()->cancel(task); } return false; } -- cgit v1.2.3