From 50036901a90c6785ba6831bee5161ccba972bda0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Aug 2013 16:50:47 +0200
Subject: [CLIENT] Fix nullpointer access

---
 src/client/client.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/client/client.c b/src/client/client.c
index 4ee1d8c..dcfb756 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -189,7 +189,6 @@ int main(int argc, char *argv[])
 			break;
 		case 'i':
 			msg.imgname = strdup( optarg );
-			printf( "Image: %s\n", msg.imgname );
 			break;
 		case 'r':
 			msg.rid = atoi( optarg );
@@ -277,8 +276,7 @@ static int dnbd3_ioctl(const char *dev, const int command, dnbd3_ioctl_t * const
 		printf( "open() for %s failed.\n", dev );
 		return FALSE;
 	}
-	if ( msg->imgname != NULL )
-	msg->imgnamelen = (uint16_t)strlen( msg->imgname );
+	if ( msg != NULL && msg->imgname != NULL ) msg->imgnamelen = (uint16_t)strlen( msg->imgname );
 	const int ret = ioctl( fd, command, msg );
 	if ( ret < 0 ) {
 		printf( "ioctl() failed.\n" );
-- 
cgit v1.2.3-55-g7522