98 lines
3.2 KiB
Diff
98 lines
3.2 KiB
Diff
From 03e7e232a323c45205d3c6ecb7d8e52e7209d9eb Mon Sep 17 00:00:00 2001
|
|
From: jiangdongxu <jiangdongxu1@huawei.com>
|
|
Date: Thu, 10 Feb 2022 22:12:50 +0800
|
|
Subject: [PATCH] bugfix: fix possible memory leak
|
|
|
|
Signed-off-by: caojinhua <caojinhua1@huawei.com>
|
|
Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
|
|
---
|
|
migration/savevm.c | 2 ++
|
|
qga/main.c | 18 +++++++++++++-----
|
|
2 files changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/migration/savevm.c b/migration/savevm.c
|
|
index d59e976d50..803cd9004d 100644
|
|
--- a/migration/savevm.c
|
|
+++ b/migration/savevm.c
|
|
@@ -1427,6 +1427,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
|
|
ret = vmstate_save(f, se, vmdesc);
|
|
if (ret) {
|
|
qemu_file_set_error(f, ret);
|
|
+ json_writer_free(vmdesc);
|
|
return ret;
|
|
}
|
|
trace_savevm_section_end(se->idstr, se->section_id, 0);
|
|
@@ -1443,6 +1444,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
|
|
error_report("%s: bdrv_inactivate_all() failed (%d)",
|
|
__func__, ret);
|
|
qemu_file_set_error(f, ret);
|
|
+ json_writer_free(vmdesc);
|
|
return ret;
|
|
}
|
|
}
|
|
diff --git a/qga/main.c b/qga/main.c
|
|
index 15fd3a4149..6f09a689ac 100644
|
|
--- a/qga/main.c
|
|
+++ b/qga/main.c
|
|
@@ -1283,7 +1283,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
if (g_mkdir_with_parents(config->state_dir, S_IRWXU) == -1) {
|
|
g_critical("unable to create (an ancestor of) the state directory"
|
|
" '%s': %s", config->state_dir, strerror(errno));
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
#endif
|
|
|
|
@@ -1308,7 +1308,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
if (!log_file) {
|
|
g_critical("unable to open specified log file: %s",
|
|
strerror(errno));
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
s->log_file = log_file;
|
|
}
|
|
@@ -1319,7 +1319,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
s->pstate_filepath,
|
|
ga_is_frozen(s))) {
|
|
g_critical("failed to load persistent state");
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
|
|
config->blacklist = ga_command_blacklist_init(config->blacklist);
|
|
@@ -1340,7 +1340,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
#ifndef _WIN32
|
|
if (!register_signal_handlers()) {
|
|
g_critical("failed to register signal handlers");
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
#endif
|
|
|
|
@@ -1353,12 +1353,20 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
s->wakeup_event = CreateEvent(NULL, TRUE, FALSE, TEXT("WakeUp"));
|
|
if (s->wakeup_event == NULL) {
|
|
g_critical("CreateEvent failed");
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
#endif
|
|
|
|
ga_state = s;
|
|
return s;
|
|
+failed:
|
|
+ g_free(s->pstate_filepath);
|
|
+ g_free(s->state_filepath_isfrozen);
|
|
+ if (s->log_file) {
|
|
+ fclose(s->log_file);
|
|
+ }
|
|
+ g_free(s);
|
|
+ return NULL;
|
|
}
|
|
|
|
static void cleanup_agent(GAState *s)
|
|
--
|
|
2.27.0
|
|
|