From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 8 May 2014 14:04:18 +0000 (+0200)
Subject: rbd-fuse.c: init 'rbd' in open_rbd_image()
X-Git-Tag: v0.81~45^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d01563f8b51dd47c878436ed61e4e63e09f5bda;p=ceph.git

rbd-fuse.c: init 'rbd' in open_rbd_image()

Init 'rbd' in open_rbd_image() with NULL and add a check for
'rbd' before dereference it to fix:

rbd_fuse/rbd-fuse.c:182:29: warning: variable 'rbd' may be uninitialized
 when used here [-Wconditional-uninitialized]
        int ret = rbd_open(ioctx, rbd->image_name, &(rbd->image), NULL);
                                  ^~~
rbd_fuse/rbd-fuse.c:151:27: note: initialize the variable 'rbd' to silence
 this warning
        struct rbd_openimage *rbd;
                                 ^
                                  = NULL

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rbd_fuse/rbd-fuse.c b/src/rbd_fuse/rbd-fuse.c
index 1f3a21795d44..f11808e65b4e 100644
--- a/src/rbd_fuse/rbd-fuse.c
+++ b/src/rbd_fuse/rbd-fuse.c
@@ -148,7 +148,7 @@ int
 open_rbd_image(const char *image_name)
 {
 	struct rbd_image *im;
-	struct rbd_openimage *rbd;
+	struct rbd_openimage *rbd = NULL;
 	int fd;
 
 	if (image_name == (char *)NULL) 
@@ -177,7 +177,7 @@ open_rbd_image(const char *image_name)
 				break;
 			}
 		}
-		if (i == MAX_RBD_IMAGES)
+		if (i == MAX_RBD_IMAGES || !rbd)
 			return -1;
 		int ret = rbd_open(ioctx, rbd->image_name, &(rbd->image), NULL);
 		if (ret < 0) {