summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorSimon Rettberg2013-08-20 16:50:47 +0200
committerSimon Rettberg2013-08-20 16:50:47 +0200
commit50036901a90c6785ba6831bee5161ccba972bda0 (patch)
treefb7c3b89bb317b650b2bede7d0c5edb5d0ea6b9f /src/client
parent[CLIENT] Finish daemon-mode support (diff)
downloaddnbd3-50036901a90c6785ba6831bee5161ccba972bda0.tar.gz
dnbd3-50036901a90c6785ba6831bee5161ccba972bda0.tar.xz
dnbd3-50036901a90c6785ba6831bee5161ccba972bda0.zip
[CLIENT] Fix nullpointer access
Diffstat (limited to 'src/client')
-rw-r--r--src/client/client.c4
1 files changed, 1 insertions, 3 deletions
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" );