Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 2A84D3980 for ; Mon, 2 May 2011 22:44:16 +0000 (UTC) Received: (qmail 31768 invoked by uid 500); 2 May 2011 22:44:15 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 31731 invoked by uid 500); 2 May 2011 22:44:15 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 31724 invoked by uid 99); 2 May 2011 22:44:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 22:44:15 +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; Mon, 02 May 2011 22:44:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 79A6A23889C5; Mon, 2 May 2011 22:43:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098819 - in /hadoop/common/branches/branch-0.20-security-203: ./ src/c++/libhdfs/ src/core/org/apache/hadoop/fs/ src/mapred/ src/test/org/apache/hadoop/fs/ src/tools/org/apache/hadoop/tools/ Date: Mon, 02 May 2011 22:43:51 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110502224351.79A6A23889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Mon May 2 22:43:50 2011 New Revision: 1098819 URL: http://svn.apache.org/viewvc?rev=1098819&view=rev Log: HDFS-596. Fix memory leak in hdfsFreeFileInfo() for libhdfs. (Zhang Bingjun via dhruba) Modified: hadoop/common/branches/branch-0.20-security-203/ (props changed) hadoop/common/branches/branch-0.20-security-203/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-0.20-security-203/src/c++/libhdfs/hdfs.c hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/fs/HarFileSystem.java (props changed) hadoop/common/branches/branch-0.20-security-203/src/mapred/ (props changed) hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/fs/TestHarFileSystem.java (props changed) hadoop/common/branches/branch-0.20-security-203/src/tools/org/apache/hadoop/tools/HadoopArchives.java (props changed) Propchange: hadoop/common/branches/branch-0.20-security-203/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 2 22:43:50 2011 @@ -1,4 +1,4 @@ -/hadoop/common/branches/branch-0.20:826138 +/hadoop/common/branches/branch-0.20:826138,880632 /hadoop/common/branches/branch-0.20-security:1087875,1097202 /hadoop/core/branches/branch-0.19:713112 /hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569 Modified: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt?rev=1098819&r1=1098818&r2=1098819&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-203/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-203/CHANGES.txt Mon May 2 22:43:50 2011 @@ -1688,6 +1688,9 @@ Release 0.20.2 - Unreleased HDFS-579. Fix DfsTask to follow the semantics of 0.19, regarding non-zero return values as failures. (Christian Kunz via cdouglas) + HDFS-596. Fix memory leak in hdfsFreeFileInfo() for libhdfs. + (Zhang Bingjun via dhruba) + Release 0.20.1 - 2009-09-01 INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 2 22:43:50 2011 @@ -1,4 +1,4 @@ -/hadoop/common/branches/branch-0.20/CHANGES.txt:826138 +/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,880632 /hadoop/common/branches/branch-0.20-security/CHANGES.txt:1087875,1097202 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112 Modified: hadoop/common/branches/branch-0.20-security-203/src/c++/libhdfs/hdfs.c URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/c%2B%2B/libhdfs/hdfs.c?rev=1098819&r1=1098818&r2=1098819&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-203/src/c++/libhdfs/hdfs.c (original) +++ hadoop/common/branches/branch-0.20-security-203/src/c++/libhdfs/hdfs.c Mon May 2 22:43:50 2011 @@ -2022,12 +2022,18 @@ hdfsFileInfo *hdfsGetPathInfo(hdfsFS fs, void hdfsFreeFileInfo(hdfsFileInfo *hdfsFileInfo, int numEntries) { - //Free the mName + //Free the mName, mOwner, and mGroup int i; for (i=0; i < numEntries; ++i) { if (hdfsFileInfo[i].mName) { free(hdfsFileInfo[i].mName); } + if (hdfsFileInfo[i].mOwner) { + free(hdfsFileInfo[i].mOwner); + } + if (hdfsFileInfo[i].mGroup) { + free(hdfsFileInfo[i].mGroup); + } } //Free entire block Propchange: hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/fs/HarFileSystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 2 22:43:50 2011 @@ -1,4 +1,4 @@ -/hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/HarFileSystem.java:826138 +/hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/HarFileSystem.java:826138,880632 /hadoop/common/trunk/src/core/org/apache/hadoop/fs/HarFileSystem.java:910709 /hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java:979485 /hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/HarFileSystem.java:713112 Propchange: hadoop/common/branches/branch-0.20-security-203/src/mapred/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 2 22:43:50 2011 @@ -1,4 +1,4 @@ -/hadoop/common/branches/branch-0.20/src/mapred:826138 +/hadoop/common/branches/branch-0.20/src/mapred:826138,880632 /hadoop/common/branches/branch-0.20-security/src/mapred:1087875,1097202 /hadoop/core/branches/branch-0.19/src/mapred:713112 /hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569 Propchange: hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/fs/TestHarFileSystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 2 22:43:50 2011 @@ -1,4 +1,4 @@ -/hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:826138 +/hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:826138,880632 /hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestHarFileSystem.java:979485 /hadoop/common/trunk/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:910709 /hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:713112 Propchange: hadoop/common/branches/branch-0.20-security-203/src/tools/org/apache/hadoop/tools/HadoopArchives.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 2 22:43:50 2011 @@ -1,4 +1,4 @@ -/hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java:826138 +/hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java:826138,880632 /hadoop/common/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java:910709 /hadoop/core/branches/branch-0.19/src/tools/org/apache/hadoop/tools/HadoopArchives.java:713112 /hadoop/core/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569