From patchwork Thu Dec 1 15:58:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [8/9] fedfsd: don't double-free upon ENOMEM Date: Thu, 01 Dec 2011 05:58:25 -0000 From: Jim Meyering X-Patchwork-Id: 128718 Message-Id: <1322755106-8171-9-git-send-email-jim@meyering.net> To: fedfs-utils-devel@oss.oracle.com 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. Spotted by coverity. Signed-off-by: Jim Meyering --- 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 8ba6468..2772064 100644 --- a/src/fedfsd/svc.c +++ b/src/fedfsd/svc.c @@ -377,10 +377,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) {