attach: and cgroup.c: be overly cautious

Realistically (as Dwight points out) it doesn't seem possible that getline won't return at least one line in this functions, however just to make absolutely sure we don't get a segv on free(NULL), check line != NULL before freeing it on exit. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

attach: and cgroup.c: be overly cautious
fa9ac567 · Serge Hallyn · 20fe4e8f · fa9ac567 · fa9ac567
Commit fa9ac567 authored May 21, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

attach.c src/lxc/attach.c +2 -1

cgroup.c src/lxc/cgroup.c +2 -1

No files found.
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -114,7 +114,8 @@ struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid)
 		}
 	}

-	free(line);
+	if (line)
+		free(line);
 	fclose(proc_file);

 	if (!found) {

--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -503,7 +503,8 @@ static char *get_all_cgroups(void)
 	}

 out:
-	free(line);
+	if (line)
+		free(line);
 	fclose(f);
 	return ret;
 }