summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2012-06-14 21:43:25 +0000
committerAndrew Stitcher <astitcher@apache.org>2012-06-14 21:43:25 +0000
commitbbbffc44b6ce962cca02b8aa0f21cc1a2b3dd551 (patch)
tree8379051e273fe230ead36053384405222dfa0d16
parentad62a37b0dfbef26943d51233083ef5a5348cb33 (diff)
downloadqpid-python-bbbffc44b6ce962cca02b8aa0f21cc1a2b3dd551.tar.gz
QPID-4049: Linux C++ broker crashes when client connects SSL with expired certificate
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1350406 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp b/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
index 826c294c80..8613059f28 100644
--- a/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
@@ -73,6 +73,8 @@ SslHandler::SslHandler(std::string id, ConnectionCodec::Factory* f, bool _nodict
SslHandler::~SslHandler() {
if (codec)
codec->closed();
+ if (timeoutTimerTask)
+ timeoutTimerTask->cancel();
delete codec;
}