Merge pull request #2817 from Rachid-Koucha/patch-5

More accurate error msg for template file

Merge pull request #2817 from Rachid-Koucha/patch-5
9fc6fd21 · Christian Brauner · GitHub · dea31fe2 · b275efe3 · 9fc6fd21
Unverified Commit 9fc6fd21 authored Jan 29, 2019 by Christian Brauner Committed by GitHub Jan 29, 2019
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

utils.c src/lxc/utils.c +7 -3

No files found.
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -910,9 +910,13 @@ char *get_template_path(const char *t)
 	int ret, len;
 	char *tpath;
-	if (t[0] == '/' && access(t, X_OK) == 0) {
+	if (t[0] == '/') {
-		tpath = strdup(t);
+		if (access(t, X_OK) == 0) {
-		return tpath;
+			return strdup(t);
+		} else {
+			SYSERROR("Bad template pathname: %s", t);
+			return NULL;
+		}
 	}
 	len = strlen(LXCTEMPLATEDIR) + strlen(t) + strlen("/lxc-") + 1;