proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-15 21:57:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
S.Çağlar Onur 2013-11-14 23:56:04 -05:00 committed by Serge Hallyn
parent c6a9b0d797
commit 9992b49cde
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lxc/lxc_monitor.c
View File

@ -89,8 +89,10 @@ int main(int argc, char *argv[])
if (regcomp(&preg, regexp, REG_NOSUB|REG_EXTENDED)) { if (regcomp(&preg, regexp, REG_NOSUB|REG_EXTENDED)) {
ERROR("failed to compile the regex '%s'", my_args.name); ERROR("failed to compile the regex '%s'", my_args.name);
free(regexp);
return -1; return -1;
} }
free(regexp);
if (my_args.lxcpath_cnt > FD_SETSIZE) { if (my_args.lxcpath_cnt > FD_SETSIZE) {
ERROR("too many paths requested, only the first %d will be monitored", 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]); lxc_monitord_spawn(my_args.lxcpath[i]);
fd = lxc_monitor_open(my_args.lxcpath[i]); fd = lxc_monitor_open(my_args.lxcpath[i]);
if (fd < 0) if (fd < 0) {
regfree(&preg);
return -1; return -1;
}
FD_SET(fd, &rfds); FD_SET(fd, &rfds);
if (fd > nfds) if (fd > nfds)
nfds = fd; nfds = fd;
@ -118,8 +122,10 @@ int main(int argc, char *argv[])
for (;;) { for (;;) {
memcpy(&rfds, &rfds_save, sizeof(rfds)); 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; return -1;
}
msg.name[sizeof(msg.name)-1] = '\0'; msg.name[sizeof(msg.name)-1] = '\0';
if (regexec(&preg, msg.name, 0, NULL, 0)) if (regexec(&preg, msg.name, 0, NULL, 0))