lxc_mount_auto_mounts: fix weirdness

The default_mounts[i].destination is never NULL except in the last 'stop here' entry. Coverity doesn't know about that and so is spewing a warning. In any case, let's add a more stringent check in case someone accidentally adds a NULL there later. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lxc_mount_auto_mounts: fix weirdness
cc4fd506 · Serge Hallyn · Stéphane Graber · 2c79e91b · cc4fd506
Commit cc4fd506 authored Oct 03, 2015 by Serge Hallyn Committed by Stéphane Graber Oct 05, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

conf.c src/lxc/conf.c +12 -10

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -803,16 +803,18 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
 					return -1;
 				}
 			}
-			if (default_mounts[i].destination) {
+			if (!default_mounts[i].destination) {
-				/* will act like strdup if %r is not present */
+				ERROR("BUG: auto mounts destination %d was NULL", i);
-				destination = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mounts[i].destination);
+				return -1;
-				if (!destination) {
+			}
-					saved_errno = errno;
+			/* will act like strdup if %r is not present */
-					SYSERROR("memory allocation error");
+			destination = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mounts[i].destination);
-					free(source);
+			if (!destination) {
-					errno = saved_errno;
+				saved_errno = errno;
-					return -1;
+				SYSERROR("memory allocation error");
-				}
+				free(source);
+				errno = saved_errno;
+				return -1;
 			}
 			mflags = add_required_remount_flags(source, destination,
 					default_mounts[i].flags);