From 6de3828e84a00a8e8d407b21c4f6512637d85930 Mon Sep 17 00:00:00 2001 From: Martin Stolle Date: Wed, 17 Jul 2013 23:02:23 -0600 Subject: [PATCH] Bug 3879: assertion failed ConnStateData::validatePinnedConnection --- src/client_side.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/client_side.cc b/src/client_side.cc index 5cf1036a59..a513e59488 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -4543,18 +4543,14 @@ ConnStateData::validatePinnedConnection(HttpRequest *request, const CachePeer *a bool valid = true; if (!Comm::IsConnOpen(pinning.serverConnection)) valid = false; - if (pinning.auth && request && strcasecmp(pinning.host, request->GetHost()) != 0) { + else if (pinning.auth && pinning.host && request && strcasecmp(pinning.host, request->GetHost()) != 0) valid = false; - } - if (request && pinning.port != request->port) { + else if (request && pinning.port != request->port) valid = false; - } - if (pinning.peer && !cbdataReferenceValid(pinning.peer)) { + else if (pinning.peer && !cbdataReferenceValid(pinning.peer)) valid = false; - } - if (aPeer != pinning.peer) { + else if (aPeer != pinning.peer) valid = false; - } if (!valid) { /* The pinning info is not safe, remove any pinning info */ -- 2.47.3