criu: DECLARE_ARG should check for null arguments

This is in preparation for the cgroups creation work, but also probably just a good idea in general. The ERROR message is handy since we print line nos. it will to give people an indication of what arg was null. Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

criu: DECLARE_ARG should check for null arguments
2566a145 · Tycho Andersen · Serge Hallyn · 9a64d3cf · 2566a145
Commit 2566a145 authored Oct 08, 2014 by Tycho Andersen Committed by Serge Hallyn Oct 08, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

lxccontainer.c src/lxc/lxccontainer.c +9 -5

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -3554,11 +3554,15 @@ static void exec_criu(struct criu_opts *opts)

 	memset(argv, 0, static_args * sizeof(*argv));

-#define DECLARE_ARG(arg) 			\
-	do {					\
-		argv[argc++] = strdup(arg);	\
-		if (!argv[argc-1])		\
-			goto err;		\
+#define DECLARE_ARG(arg) 					\
+	do {							\
+		if (arg == NULL) {				\
+			ERROR("Got NULL argument for criu");	\
+			goto err;				\
+		}						\
+		argv[argc++] = strdup(arg);			\
+		if (!argv[argc-1])				\
+			goto err;				\
 	} while (0)

 	argv[argc++] = on_path("criu", NULL);