External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

command: avoid memory leak

Browse Source 
* src/util/command.c (virCommandRun): Fix yesterday's regression
on logging, and avoid leaking log-only output captures.
Reported by Hu Tao.
This commit is contained in:
Eric Blake 2010-12-08 08:03:29 -07:00
parent c778fe9678
commit 8e9ee30e8a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/command.c
View File

@ -964,10 +964,12 @@ virCommandRun(virCommandPtr cmd, int *exitstatus)
if (!cmd->outfdptr) { if (!cmd->outfdptr) {
cmd->outfdptr = &cmd->outfd; cmd->outfdptr = &cmd->outfd;
cmd->outbuf = &outbuf; cmd->outbuf = &outbuf;
string_io = true;
} }
if (!cmd->errfdptr) { if (!cmd->errfdptr) {
cmd->errfdptr = &cmd->errfd; cmd->errfdptr = &cmd->errfd;
cmd->errbuf = &errbuf; cmd->errbuf = &errbuf;
string_io = true;
} }
if (virCommandRunAsync(cmd, NULL) < 0) { if (virCommandRunAsync(cmd, NULL) < 0) {
@ -1009,6 +1011,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus)
VIR_DEBUG("ignoring failed close on fd %d", tmpfd); VIR_DEBUG("ignoring failed close on fd %d", tmpfd);
cmd->outfdptr = NULL; cmd->outfdptr = NULL;
cmd->outbuf = NULL; cmd->outbuf = NULL;
VIR_FREE(outbuf);
} }
if (cmd->errbuf == &errbuf) { if (cmd->errbuf == &errbuf) {
int tmpfd = cmd->errfd; int tmpfd = cmd->errfd;
@ -1016,6 +1019,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus)
VIR_DEBUG("ignoring failed close on fd %d", tmpfd); VIR_DEBUG("ignoring failed close on fd %d", tmpfd);
cmd->errfdptr = NULL; cmd->errfdptr = NULL;
cmd->errbuf = NULL; cmd->errbuf = NULL;
VIR_FREE(errbuf);
} }
return ret; return ret;