Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4A49C200B49 for ; Wed, 3 Aug 2016 20:17:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 48CB6160A86; Wed, 3 Aug 2016 18:17:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 902BD160A5D for ; Wed, 3 Aug 2016 20:17:50 +0200 (CEST) Received: (qmail 55474 invoked by uid 500); 3 Aug 2016 18:17:49 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 55463 invoked by uid 99); 3 Aug 2016 18:17:49 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2016 18:17:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 432FFC0E26 for ; Wed, 3 Aug 2016 18:17:49 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id oSYm89-yhIMM for ; Wed, 3 Aug 2016 18:17:48 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id C590A60E4A for ; Wed, 3 Aug 2016 18:17:47 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 032EDE0069 for ; Wed, 3 Aug 2016 18:17:47 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id F1EF53A00EC for ; Wed, 3 Aug 2016 18:17:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1755101 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/c/src/zookeeper.c Date: Wed, 03 Aug 2016 18:17:46 -0000 To: commits@zookeeper.apache.org From: rgs@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160803181746.F1EF53A00EC@svn01-us-west.apache.org> archived-at: Wed, 03 Aug 2016 18:17:51 -0000 Author: rgs Date: Wed Aug 3 18:17:46 2016 New Revision: 1755101 URL: http://svn.apache.org/viewvc?rev=1755101&view=rev Log: ZOOKEEPER-2498: Potential resource leak in C client when processing unexpected / out of order response (Michael Han via rgs) Modified: zookeeper/branches/branch-3.5/CHANGES.txt zookeeper/branches/branch-3.5/src/c/src/zookeeper.c Modified: zookeeper/branches/branch-3.5/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1755101&r1=1755100&r2=1755101&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/CHANGES.txt (original) +++ zookeeper/branches/branch-3.5/CHANGES.txt Wed Aug 3 18:17:46 2016 @@ -11,6 +11,9 @@ BUGFIXES: ZOOKEEPER-1256: ClientPortBindTest is failing on Mac OS X (Camille via phunt) + ZOOKEEPER-2498: Potential resource leak in C client when processing + unexpected / out of order response (Michael Han via rgs) + IMPROVEMENTS: Modified: zookeeper/branches/branch-3.5/src/c/src/zookeeper.c URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/c/src/zookeeper.c?rev=1755101&r1=1755100&r2=1755101&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/src/c/src/zookeeper.c (original) +++ zookeeper/branches/branch-3.5/src/c/src/zookeeper.c Wed Aug 3 18:17:46 2016 @@ -2936,9 +2936,10 @@ int zookeeper_process(zhandle_t *zh, int // put the completion back on the queue (so it gets properly // signaled and deallocated) and disconnect from the server queue_completion(&zh->sent_requests,cptr,1); - return handle_socket_error_msg(zh, __LINE__,ZRUNTIMEINCONSISTENCY, - "unexpected server response: expected %#x, but received %#x", - hdr.xid,cptr->xid); + return api_epilog(zh, + handle_socket_error_msg(zh, __LINE__,ZRUNTIMEINCONSISTENCY, + "unexpected server response: expected %#x, but received %#x", + hdr.xid,cptr->xid)); } if (hdr.zxid > 0) {