From commits-return-47756-archive-asf-public=cust-asf.ponee.io@qpid.apache.org Thu Jan 24 16:47:11 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 AB39818062C for ; Thu, 24 Jan 2019 16:47:10 +0100 (CET) Received: (qmail 95867 invoked by uid 500); 24 Jan 2019 15:47:09 -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 95858 invoked by uid 99); 24 Jan 2019 15:47:09 -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; Thu, 24 Jan 2019 15:47:09 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 46D458552B; Thu, 24 Jan 2019 15:47:09 +0000 (UTC) Date: Thu, 24 Jan 2019 15:47:09 +0000 To: "commits@qpid.apache.org" Subject: [qpid-dispatch] branch master updated: DISPATCH-1247: fix minor bitmask leak MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154834482918.671.1065071634717938971@gitbox.apache.org> From: kgiusti@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: 1fe70381cc64c9d3e38cc9eff2a8a07c56736f82 X-Git-Newrev: 5785683387f85adb58299b2104def41bf1cb049e X-Git-Rev: 5785683387f85adb58299b2104def41bf1cb049e 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. kgiusti 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 5785683 DISPATCH-1247: fix minor bitmask leak 5785683 is described below commit 5785683387f85adb58299b2104def41bf1cb049e Author: Kenneth Giusti AuthorDate: Fri Jan 18 11:00:27 2019 -0500 DISPATCH-1247: fix minor bitmask leak This closes #442 --- src/router_node.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router_node.c b/src/router_node.c index 8c44264..2402abe 100644 --- a/src/router_node.c +++ b/src/router_node.c @@ -513,6 +513,7 @@ static bool AMQP_rx_handler(void* context, qd_link_t *link) pn_delivery_update(pnd, PN_RELEASED); pn_delivery_settle(pnd); qd_message_free(msg); + qd_bitmask_free(link_exclusions); return next_delivery; } @@ -589,8 +590,6 @@ static bool AMQP_rx_handler(void* context, qd_link_t *link) delivery = qdr_link_deliver(rlink, msg, ingress_iter, pn_delivery_settled(pnd), link_exclusions, ingress_index); } - - if (delivery) { // // Settle the proton delivery only if all the data has arrived @@ -609,6 +608,7 @@ static bool AMQP_rx_handler(void* context, qd_link_t *link) // // If there is no delivery, the message is now and will always be unroutable because there is no address. // + qd_bitmask_free(link_exclusions); qd_message_set_discard(msg, true); pn_link_flow(pn_link, 1); pn_delivery_update(pnd, PN_REJECTED); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org