diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-07-15 17:52:52 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-09-08 17:57:32 +0400 |
| commit | 3e3e302ff388669d811077248aee45c45a14168e (patch) | |
| tree | a0538a6972d5f5de27ada323b3816d8f68e8d420 /qga | |
| parent | 2aa67a919680ed62bbfc77fffbda2ab2e9490d03 (diff) | |
qga: free remaining leaking state
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/guest-agent-command-state.c | 6 | ||||
| -rw-r--r-- | qga/guest-agent-core.h | 1 | ||||
| -rw-r--r-- | qga/main.c | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/qga/guest-agent-command-state.c b/qga/guest-agent-command-state.c index 4de229cd78..e609d320f0 100644 --- a/qga/guest-agent-command-state.c +++ b/qga/guest-agent-command-state.c @@ -71,3 +71,9 @@ GACommandState *ga_command_state_new(void) cs->groups = NULL; return cs; } + +void ga_command_state_free(GACommandState *cs) +{ + g_slist_free_full(cs->groups, g_free); + g_free(cs); +} diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h index 0a49516045..63e9d398ae 100644 --- a/qga/guest-agent-core.h +++ b/qga/guest-agent-core.h @@ -28,6 +28,7 @@ void ga_command_state_add(GACommandState *cs, void ga_command_state_init_all(GACommandState *cs); void ga_command_state_cleanup_all(GACommandState *cs); GACommandState *ga_command_state_new(void); +void ga_command_state_free(GACommandState *cs); bool ga_logging_enabled(GAState *s); void ga_disable_logging(GAState *s); void ga_enable_logging(GAState *s); diff --git a/qga/main.c b/qga/main.c index bb48214d18..0b9d04ea04 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1371,6 +1371,8 @@ int main(int argc, char **argv) end: if (s->command_state) { ga_command_state_cleanup_all(s->command_state); + ga_command_state_free(s->command_state); + json_message_parser_destroy(&s->parser); } if (s->channel) { ga_channel_free(s->channel); @@ -1383,6 +1385,10 @@ end: } config_free(config); + if (s->main_loop) { + g_main_loop_unref(s->main_loop); + } + g_free(s); return ret; } |