commands: avoid NULL pointer dereference

lxc_cmd_get_lxcpath() and lxc_cmd_get_name() both pass a nil pointer to
fill_sock_name(). Make sure that they are not dereferenced.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index b17879b54bc0d2047301617b79b03aaf3a8d056e..66c8aaeae95954a891b3e34a5934e47a65032c13 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -74,14 +74,19 @@
 
 lxc_log_define(lxc_commands, lxc);
 
-static int fill_sock_name(char *path, int len, const char *name,
+static int fill_sock_name(char *path, int len, const char *lxcname,
                          const char *lxcpath, const char *hashed_sock_name)
 {
+       const char *name;
        char *tmppath;
        size_t tmplen;
        uint64_t hash;
        int ret;
 
+       name = lxcname;
+       if (!name)
+               name = "";
+
        if (hashed_sock_name != NULL) {
                ret = snprintf(path, len, "lxc/%s/command", hashed_sock_name);
                if (ret < 0 || ret >= len) {