Patchwork [8/8] fedfsd: don't double-free upon ENOMEM

login
register
mail settings
Submitter Jim Meyering
Date Nov. 30, 2011, 8:51 p.m.
Message ID <1322686298-14634-9-git-send-email-jim@meyering.net>
Download mbox | patch
Permalink /patch/128574/
State Superseded
Headers show

Comments

Jim Meyering - Nov. 30, 2011, 8:51 p.m.
From: Jim Meyering <meyering@redhat.com>

* 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(-)

Patch

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) {