Commit 9992b49c by S.Çağlar Onur Committed by Serge Hallyn

fix memory leaks reported by cppcheck in src/lxc/lxc_monitor.c. Since this is a…

fix memory leaks reported by cppcheck in src/lxc/lxc_monitor.c. Since this is a cli tool it doesn't really matter but might silence some warnings for debugging Signed-off-by: 's avatarS.Çağlar Onur <caglar@10ur.org> Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent c6a9b0d7
......@@ -89,8 +89,10 @@ int main(int argc, char *argv[])
if (regcomp(&preg, regexp, REG_NOSUB|REG_EXTENDED)) {
ERROR("failed to compile the regex '%s'", my_args.name);
free(regexp);
return -1;
}
free(regexp);
if (my_args.lxcpath_cnt > FD_SETSIZE) {
ERROR("too many paths requested, only the first %d will be monitored", FD_SETSIZE);
......@@ -104,8 +106,10 @@ int main(int argc, char *argv[])
lxc_monitord_spawn(my_args.lxcpath[i]);
fd = lxc_monitor_open(my_args.lxcpath[i]);
if (fd < 0)
if (fd < 0) {
regfree(&preg);
return -1;
}
FD_SET(fd, &rfds);
if (fd > nfds)
nfds = fd;
......@@ -118,8 +122,10 @@ int main(int argc, char *argv[])
for (;;) {
memcpy(&rfds, &rfds_save, sizeof(rfds));
if (lxc_monitor_read_fdset(&rfds, nfds, &msg, -1) < 0)
if (lxc_monitor_read_fdset(&rfds, nfds, &msg, -1) < 0) {
regfree(&preg);
return -1;
}
msg.name[sizeof(msg.name)-1] = '\0';
if (regexec(&preg, msg.name, 0, NULL, 0))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment