log: Don't crash when name is NULL

This fixes a crash in lxc-autostart following the addition of lxc_log_init as lxc-autostart doesn't use the name property. Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

log: Don't crash when name is NULL
74f052dd · Stéphane Graber · ce79774f · 74f052dd
Unverified Commit 74f052dd authored Feb 07, 2014 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

log.c src/lxc/log.c +7 -0

No files found.
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -191,6 +191,9 @@ static char *build_log_path(const char *name, const char *lxcpath)
 	char *p;
 	int len, ret, use_dir;

+	if (!name)
+		return NULL;
+
 #if USE_CONFIGPATH_LOGS
 	use_dir = 1;
 #else
@@ -326,6 +329,10 @@ extern int lxc_log_init(const char *name, const char *file,
 		if (geteuid())
 			return 0;

+		/* if no name was specified, there nothing to do */
+		if (!name)
+			return 0;
+
 		ret = -1;

 		if (!lxcpath)