From 74cfb455c59298f86849541e724ae346ff205c3d Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 14 Feb 2018 16:50:24 -0600 Subject: [PATCH] kill_all: create strings with xasprintf --- src/rc/kill_all.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/rc/kill_all.c b/src/rc/kill_all.c index f3500227..d6ce354b 100644 --- a/src/rc/kill_all.c +++ b/src/rc/kill_all.c @@ -87,10 +87,11 @@ static int mount_proc(void) static bool is_user_process(pid_t pid) { - char buf[PATH_MAX+1]; + char *buf = NULL; FILE *fp; - char path[PATH_MAX+1]; + char *path = NULL; pid_t temp_pid; + size_t size; bool user_process = true; while (pid >0 && user_process) { @@ -98,8 +99,9 @@ static bool is_user_process(pid_t pid) user_process = false; continue; } - snprintf(path, sizeof(path), "/proc/%d/status", pid); + xasprintf(&path, "/proc/%d/status", pid); fp = fopen(path, "r"); + free(path); /* * if we could not open the file, the process disappeared, which * leaves us no way to determine for sure whether it was a user @@ -112,11 +114,14 @@ static bool is_user_process(pid_t pid) } temp_pid = -1; while (! feof(fp)) { - buf[0] = 0; - if (fgets(buf, sizeof(buf), fp)) + buf = NULL; + if (getline(&buf, &size, fp) != -1) { sscanf(buf, "PPid: %d", &temp_pid); - else + free(buf); + } else { + free(buf); break; + } } fclose(fp); if (temp_pid == -1) { @@ -135,7 +140,7 @@ static int signal_processes(int sig, RC_STRINGLIST *omits, bool dryrun) sigset_t oldsigs; DIR *dir; struct dirent *d; - char buf[PATH_MAX+1]; + char *buf = NULL; pid_t pid; int sendcount = 0; @@ -170,7 +175,11 @@ static int signal_processes(int sig, RC_STRINGLIST *omits, bool dryrun) continue; /* Is this a process we have been requested to omit? */ - sprintf(buf, "%d", pid); + if (buf) { + free(buf); + buf = NULL; + } + xasprintf(&buf, "%d", pid); if (rc_stringlist_find(omits, buf)) continue;