From patchwork Wed Nov 30 20:51:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Meyering X-Patchwork-Id: 128574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "acsinet15.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 49E2D1007D1 for ; Thu, 1 Dec 2011 07:59:06 +1100 (EST) Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by acsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id pAUKwwlI032201 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 Nov 2011 20:58:59 GMT Received: from oss.oracle.com (oss.oracle.com [141.146.12.120]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id pAUKwvAD015652 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Nov 2011 20:58:57 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1RVrEy-0003kn-Ij; Wed, 30 Nov 2011 12:58:52 -0800 Received: from acsinet13.oracle.com ([141.146.126.235]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1RVrEw-0003kC-S7 for fedfs-utils-devel@oss.oracle.com; Wed, 30 Nov 2011 12:58:50 -0800 Received: from mx.meyering.net (mx.meyering.net [88.168.87.75]) by acsinet13.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id pAUKwmqr021705 for ; Wed, 30 Nov 2011 20:58:50 GMT Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) id 0C30B6090F; Wed, 30 Nov 2011 21:51:49 +0100 (CET) From: Jim Meyering To: fedfs-utils-devel@oss.oracle.com Date: Wed, 30 Nov 2011 21:51:38 +0100 Message-Id: <1322686298-14634-9-git-send-email-jim@meyering.net> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1322686298-14634-1-git-send-email-jim@meyering.net> References: <1322686298-14634-1-git-send-email-jim@meyering.net> X-Flow-Control-Info: class=Default ip=88.168.87.75 ct-class=G1 ct-vol1=0 ct-vol2=0 ct-vol3=0 ct-risk=0 ct-spam1=0 ct-spam2=0 ct-bulk=0 rcpts=1 size=784 Subject: [fedfs-utils] [PATCH 8/8] fedfsd: don't double-free upon ENOMEM X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet22.oracle.com [141.146.126.238] X-CT-RefId: str=0001.0A090201.4ED69915.0010:SCFSTAT1119972, ss=1, re=-4.000, fgs=0 X-Auth-Type: Internal IP From: Jim Meyering * src/fedfsd/svc.c (fedfsd_pathwalk): If nsdb_normalize_path were to return NULL, "result" would be freed once by the very next stmt, and then again in the following "if"-block. Remove the latter. --- src/fedfsd/svc.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/fedfsd/svc.c b/src/fedfsd/svc.c index 3509082..8c46c0c 100644 --- a/src/fedfsd/svc.c +++ b/src/fedfsd/svc.c @@ -374,10 +374,8 @@ fedfsd_pathwalk(const FedFsPathName fpath, char **pathname) tmp = nsdb_normalize_path(result); free(result); - if (tmp == NULL) { - free(result); + if (tmp == NULL) return FEDFS_ERR_SVRFAULT; - } retval = fedfsd_pathwalk_check_term(tmp); switch (retval) {