Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BC2C1101D8 for ; Wed, 4 Dec 2013 04:21:18 +0000 (UTC) Received: (qmail 56616 invoked by uid 500); 4 Dec 2013 04:21:17 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 56516 invoked by uid 500); 4 Dec 2013 04:21:16 -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 56505 invoked by uid 99); 4 Dec 2013 04:21:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 04:21:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 04:21:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9687B23888E2; Wed, 4 Dec 2013 04:20:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1547703 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/c/src/cli.c Date: Wed, 04 Dec 2013 04:20:53 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131204042053.9687B23888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Wed Dec 4 04:20:53 2013 New Revision: 1547703 URL: http://svn.apache.org/r1547703 Log: ZOOKEEPER-1632. fix memory leaks in cli_st (fpj via michim) Modified: zookeeper/branches/branch-3.4/CHANGES.txt zookeeper/branches/branch-3.4/src/c/src/cli.c Modified: zookeeper/branches/branch-3.4/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1547703&r1=1547702&r2=1547703&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/CHANGES.txt (original) +++ zookeeper/branches/branch-3.4/CHANGES.txt Wed Dec 4 04:20:53 2013 @@ -170,6 +170,8 @@ BUGFIXES: ZOOKEEPER-1821. very ugly warning when compiling load_gen.c (german blanco via fpj) + ZOOKEEPER-1632. fix memory leaks in cli_st (fpj via michim) + IMPROVEMENTS: ZOOKEEPER-1564. Allow JUnit test build with IBM Java Modified: zookeeper/branches/branch-3.4/src/c/src/cli.c URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/c/src/cli.c?rev=1547703&r1=1547702&r2=1547703&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/c/src/cli.c (original) +++ zookeeper/branches/branch-3.4/src/c/src/cli.c Wed Dec 4 04:20:53 2013 @@ -182,6 +182,11 @@ void my_string_completion(int rc, const shutdownThisThing=1; } +void my_string_completion_free_data(int rc, const char *name, const void *data) { + my_string_completion(rc, name, data); + free((void*)data); +} + void my_data_completion(int rc, const char *value, int value_len, const struct Stat *stat, const void *data) { struct timeval tv; @@ -418,7 +423,7 @@ void processline(char *line) { // my_string_completion, strdup(line)); // } rc = zoo_acreate(zh, line, "new", 3, &ZOO_OPEN_ACL_UNSAFE, flags, - my_string_completion, strdup(line)); + my_string_completion_free_data, strdup(line)); if (rc) { fprintf(stderr, "Error %d for %s\n", rc, line); } @@ -442,7 +447,7 @@ void processline(char *line) { fprintf(stderr, "Path must start with /, found: %s\n", line); return; } - rc = zoo_async(zh, line, my_string_completion, strdup(line)); + rc = zoo_async(zh, line, my_string_completion_free_data, strdup(line)); if (rc) { fprintf(stderr, "Error %d for %s\n", rc, line); }