From 6eee473eba94697953e8b3e1b04fe5ef1de5f474 Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amarts@redhat.com>
Date: Tue, 5 Jun 2012 14:15:54 +0530
Subject: core: coverity fixes (mostly resource leak fixes)

currently working on obvious resource leak reports in coverity

Change-Id: I261f4c578987b16da399ab5a504ad0fda0b176b1
Signed-off-by: Amar Tumballi <amarts@redhat.com>
BUG: 789278
Reviewed-on: http://review.gluster.com/3265
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
---
 libglusterfs/src/dict.c      | 2 ++
 libglusterfs/src/run.c       | 8 ++++++--
 libglusterfs/src/statedump.c | 3 +++
 libglusterfs/src/xlator.c    | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'libglusterfs')

diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c
index 804841470..5ae61fd3d 100644
--- a/libglusterfs/src/dict.c
+++ b/libglusterfs/src/dict.c
@@ -265,6 +265,8 @@ _dict_set (dict_t *this,
         if (this->free_pair_in_use) {
                 pair = mem_get0 (THIS->ctx->dict_pair_pool);
                 if (!pair) {
+                        if (key_free)
+                                GF_FREE (key);
                         return -1;
                 }
         }
diff --git a/libglusterfs/src/run.c b/libglusterfs/src/run.c
index 34d75df69..50c1e30bf 100644
--- a/libglusterfs/src/run.c
+++ b/libglusterfs/src/run.c
@@ -67,7 +67,10 @@ runner_chio (runner_t *runner, int fd)
 {
         GF_ASSERT (fd > 0 && fd < 3);
 
-        return runner->chio[fd];
+        if ((fd > 0) && (fd < 3))
+                return runner->chio[fd];
+
+        return NULL;
 }
 
 static void
@@ -194,7 +197,8 @@ runner_redir (runner_t *runner, int fd, int tgt_fd)
 {
         GF_ASSERT (fd > 0 && fd < 3);
 
-        runner->chfd[fd] = (tgt_fd >= 0) ? tgt_fd : -2;
+        if ((fd > 0) && (fd < 3))
+                runner->chfd[fd] = (tgt_fd >= 0) ? tgt_fd : -2;
 }
 
 int
diff --git a/libglusterfs/src/statedump.c b/libglusterfs/src/statedump.c
index 899d8ef2b..694146874 100644
--- a/libglusterfs/src/statedump.c
+++ b/libglusterfs/src/statedump.c
@@ -608,6 +608,9 @@ gf_proc_dump_options_init ()
 
         }
 
+        if (fp)
+                fclose (fp);
+
         return 0;
 }
 
diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c
index 470087df9..7c081fa55 100644
--- a/libglusterfs/src/xlator.c
+++ b/libglusterfs/src/xlator.c
@@ -168,6 +168,9 @@ xlator_volopt_dynload (char *xlator_type, void **dl_handle,
 
         ret = 0;
  out:
+        if (name)
+                GF_FREE (name);
+
         gf_log ("xlator", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
 
-- 
cgit