From commits-return-47856-archive-asf-public=cust-asf.ponee.io@qpid.apache.org Wed Feb 27 17:58:10 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AC040180608 for ; Wed, 27 Feb 2019 18:58:09 +0100 (CET) Received: (qmail 68877 invoked by uid 500); 27 Feb 2019 17:58:08 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 68868 invoked by uid 99); 27 Feb 2019 17:58:08 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2019 17:58:08 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3414782E8A; Wed, 27 Feb 2019 17:58:08 +0000 (UTC) Date: Wed, 27 Feb 2019 17:58:08 +0000 To: "commits@qpid.apache.org" Subject: [qpid-dispatch] branch master updated: DISPATCH-1272 - Zeroed the qd_link->pn_link reference so there would be no attempt to send out a detach by CORE_link_detach if the outgoing pn_link has already been freed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155129028813.2444.7838741549811474082@gitbox.apache.org> From: gmurthy@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: qpid-dispatch X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8e4bd11915963354e106e654a48891c468dbbf27 X-Git-Newrev: 8e94c5cf6f98083af3066b8cff2fd5aa0b176027 X-Git-Rev: 8e94c5cf6f98083af3066b8cff2fd5aa0b176027 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. gmurthy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git The following commit(s) were added to refs/heads/master by this push: new 8e94c5c DISPATCH-1272 - Zeroed the qd_link->pn_link reference so there would be no attempt to send out a detach by CORE_link_detach if the outgoing pn_link has already been freed 8e94c5c is described below commit 8e94c5cf6f98083af3066b8cff2fd5aa0b176027 Author: Ganesh Murthy AuthorDate: Wed Feb 27 12:56:48 2019 -0500 DISPATCH-1272 - Zeroed the qd_link->pn_link reference so there would be no attempt to send out a detach by CORE_link_detach if the outgoing pn_link has already been freed --- src/container.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/container.c b/src/container.c index 12c89b9..2e9bace 100644 --- a/src/container.c +++ b/src/container.c @@ -401,8 +401,14 @@ void qd_conn_event_batch_complete(qd_container_t *container, qd_connection_t *qd while(to_free) { if (!conn_closed) { - if (to_free->pn_link) + if (to_free->pn_link) { + qd_link_t *qd_link = (qd_link_t*) pn_link_get_context(to_free->pn_link); + if (qd_link) { + qd_link->pn_link = 0; + } + pn_link_set_context(to_free->pn_link, 0); pn_link_free(to_free->pn_link); + } if (to_free->pn_session) pn_session_free(to_free->pn_session); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org