From 41f05fcefc1c192a3f322e827114897ec0ace316 Mon Sep 17 00:00:00 2001
From: Csaba Henk <csaba@gluster.com>
Date: Wed, 24 Mar 2010 14:01:36 +0000
Subject: Fix further cppcheck reported issues.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: Patrick Matthäi <pmatthaei@debian.org>
Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 420 (fix leaks pointed out by cppcheck static analyzer)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=420
---
 libglusterfs/src/dict.c | 27 +++++++++++++++++++++------
 libglusterfs/src/fd.c   |  3 ++-
 libglusterfs/src/spec.y | 21 ++++++++++++++++++++-
 3 files changed, 43 insertions(+), 8 deletions(-)

(limited to 'libglusterfs')

diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c
index b8728ac1306..9e97bf1d422 100644
--- a/libglusterfs/src/dict.c
+++ b/libglusterfs/src/dict.c
@@ -168,19 +168,32 @@ data_copy (data_t *old)
 
 	if (old) {
 		newdata->len = old->len;
-		if (old->data)
+		if (old->data) {
 			newdata->data = memdup (old->data, old->len);
-		if (old->vec)
+			if (!newdata->data)
+				goto err_out;
+		}
+		if (old->vec) {
 			newdata->vec = memdup (old->vec, old->len * (sizeof (void *) +
 								     sizeof (size_t)));
-		if (!old->data && !old->vec) {
-			gf_log ("dict", GF_LOG_CRITICAL,
-				"@newdata->data || @newdata->vec got NULL from CALLOC()");
-			return NULL;
+			if (!newdata->vec)
+				goto err_out;
 		}
 	}
 
 	return newdata;
+
+ err_out:
+
+	if (newdata->data)
+		FREE (newdata->data);
+	if (newdata->vec)
+		FREE (newdata->vec);
+	FREE (newdata);
+
+	gf_log ("dict", GF_LOG_CRITICAL,
+		"@newdata->data || @newdata->vec got NULL from CALLOC()");
+	return NULL;
 }
 
 static data_pair_t *
@@ -248,6 +261,8 @@ _dict_set (dict_t *this,
 	if (!pair->key) {
 		gf_log ("dict", GF_LOG_CRITICAL,
 			"@pair->key - NULL returned by CALLOC");
+		FREE (pair);
+
 		return -1;
 	}
 
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c
index b24d0089d21..ee529f35645 100644
--- a/libglusterfs/src/fd.c
+++ b/libglusterfs/src/fd.c
@@ -461,12 +461,13 @@ fd_unref (fd_t *fd)
 fd_t *
 fd_bind (fd_t *fd)
 {
-        inode_t *inode = fd->inode;
+        inode_t *inode = NULL;
 
         if (!fd) {
                 gf_log ("fd.c", GF_LOG_ERROR, "fd is NULL");
                 return NULL;
         }
+        inode = fd->inode;
 
         LOCK (&inode->lock);
         {
diff --git a/libglusterfs/src/spec.y b/libglusterfs/src/spec.y
index ec9101a2c21..84ab4df855a 100644
--- a/libglusterfs/src/spec.y
+++ b/libglusterfs/src/spec.y
@@ -152,11 +152,18 @@ new_section (char *name)
 {
         extern int yylineno;
         xlator_t *trav = complete_tree;
-        xlator_t *node = (void *) calloc (1, sizeof (*node));
+        xlator_t *node = NULL;
+
+        node = (void *) calloc (1, sizeof (*node));
+        if (!node) {
+                gf_log ("parser", GF_LOG_ERROR, "Out of memory");
+                return -1;
+        }
 
         if (!name) {
                 gf_log ("parser", GF_LOG_DEBUG, 
 			"Invalid argument name: '%s'", name);
+                FREE (node);
                 return -1;
         }
 
@@ -283,6 +290,10 @@ section_sub (char *sub)
         }
   
         xlparent = (void *) calloc (1, sizeof (*xlparent));
+        if (!xlparent) {
+                gf_log ("parser", GF_LOG_ERROR, "Out of memory");
+                return -1;
+        }
         xlparent->xlator = tree;
 
         tmp = trav->parents;
@@ -295,6 +306,11 @@ section_sub (char *sub)
         }
 
         xlchild = (void *) calloc (1, sizeof(*xlchild));
+        if (!xlchild) {
+                FREE (xlparent);
+                gf_log ("parser", GF_LOG_ERROR, "Out of memory");
+                return -1;
+        }
         xlchild->xlator = trav;
 
         tmp = tree->children;
@@ -476,11 +492,14 @@ parse_backtick (FILE *srcfp, FILE *dstfp)
 
 	cmd = CALLOC (cmd_buf_size, 1);
         if (cmd == NULL) {
+                gf_log ("parser", GF_LOG_ERROR, "Out of memory");
                 return -1;
         }
 
 	result = CALLOC (cmd_buf_size * 2, 1);
         if (result == NULL) {
+                FREE (cmd);
+                gf_log ("parser", GF_LOG_ERROR, "Out of memory");
                 return -1;
         }
 
-- 
cgit