Projects
home:dongzhihai
qemu
_service:tar_scm:bugfix-fix-possible-memory-lea...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm:bugfix-fix-possible-memory-leak.patch of Package qemu
From e6a20580801314e9d47682d7b8d8161c030eab04 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> Signed-off-by: Adttil <yangtao286@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 eec5503a42..477a19719f 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1553,6 +1553,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; } @@ -1572,6 +1573,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f, migrate_set_error(ms, local_err); error_report_err(local_err); qemu_file_set_error(f, ret); + json_writer_free(vmdesc); return ret; } } diff --git a/qga/main.c b/qga/main.c index 8668b9f3d3..c4dcbb86be 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1399,7 +1399,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 @@ -1424,7 +1424,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; } @@ -1435,7 +1435,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; } if (config->allowedrpcs) { @@ -1465,7 +1465,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 @@ -1478,12 +1478,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
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2