david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slirp: fix slirp_add_exec() leaks

Browse Source 
Free the list elements allocated in add_exec().

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Marc-André Lureau 2018-11-10 17:45:44 +04:00 committed by Samuel Thibault
parent b7f43bf2f6
commit c27f247865
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slirp/misc.h
View File

@ -12,7 +12,7 @@ struct ex_list {
void *ex_chardev; void *ex_chardev;
struct in_addr ex_addr; /* Server address */ struct in_addr ex_addr; /* Server address */
int ex_fport; /* Port to telnet to */ int ex_fport; /* Port to telnet to */
const char *ex_exec; /* Command line of what to exec */ char *ex_exec; /* Command line of what to exec */
struct ex_list *ex_next; struct ex_list *ex_next;
}; };

8
slirp/slirp.c
View File

@ -342,6 +342,14 @@ Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork,
void slirp_cleanup(Slirp *slirp) void slirp_cleanup(Slirp *slirp)
{ {
struct ex_list *e, *next;
for (e = slirp->exec_list; e; e = next) {
next = e->ex_next;
g_free(e->ex_exec);
g_free(e);
}
QTAILQ_REMOVE(&slirp_instances, slirp, entry); QTAILQ_REMOVE(&slirp_instances, slirp, entry);
unregister_savevm(NULL, "slirp", slirp); unregister_savevm(NULL, "slirp", slirp);