diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2010-08-31 12:52:34 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-08-31 11:31:23 -0700 |
| commit | 70652df2f7780aa734119941ac54d88ae6de7ae9 (patch) | |
| tree | 96928b36d2412c211846e52d73dd2b3fb45b420f /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | e7cbae70c89c8813918d9deb3895cb6886cdaeeb (diff) | |
mgmt/glusterd: memory leak fixes
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1186 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1186
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 1866a9904ec..0861d021913 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -661,6 +661,7 @@ glusterd_brickinfo_get (char *brick, glusterd_volinfo_t *volinfo, char *hostname = NULL; char *path = NULL; char *dup_brick = NULL; + char *free_ptr = NULL; glusterd_brickinfo_t *tmp = NULL; GF_ASSERT (brick); @@ -675,6 +676,8 @@ glusterd_brickinfo_get (char *brick, glusterd_volinfo_t *volinfo, "Out of memory"); ret = -1; goto out; + } else { + free_ptr = dup_brick; } hostname = strtok (dup_brick, ":"); @@ -701,8 +704,8 @@ glusterd_brickinfo_get (char *brick, glusterd_volinfo_t *volinfo, *brickinfo = tmp; out: - if (dup_brick) - GF_FREE (dup_brick); + if (free_ptr) + GF_FREE (free_ptr); gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); return ret; @@ -1189,7 +1192,7 @@ glusterd_build_volume_dict (dict_t **vols) out: gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); if (ret) - dict_destroy (dict); + dict_unref (dict); return ret; } |