mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/qtest/vhost-user-test: Fix memory leaks

Browse Source 
Do not allocate resources in case we return early, and make sure
to free dest_cmdline at the end.

Reported-by: Euler Robot <euler.robot@huawei.com>
Reported-by: Pan Nengyuan <pannengyuan@huawei.com>
Message-Id: <20200116140736.9498-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2020-01-16 15:07:36 +01:00
parent 16c5c6928f
commit 99fd3178a0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/qtest/vhost-user-test.c
View File

@ -707,9 +707,9 @@ static void test_read_guest_mem(void *obj, void *arg, QGuestAllocator *alloc)
static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc) static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc)
{ {
TestServer *s = arg; TestServer *s = arg;
TestServer *dest = test_server_new("dest"); TestServer *dest;
GString *dest_cmdline = g_string_new(qos_get_current_command_line()); GString *dest_cmdline;
char *uri = g_strdup_printf("%s%s", "unix:", dest->mig_path); char *uri;
QTestState *to; QTestState *to;
GSource *source; GSource *source;
QDict *rsp; QDict *rsp;
@ -720,6 +720,10 @@ static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc)
return; return;
} }
dest = test_server_new("dest");
dest_cmdline = g_string_new(qos_get_current_command_line());
uri = g_strdup_printf("%s%s", "unix:", dest->mig_path);
size = get_log_size(s); size = get_log_size(s);
g_assert_cmpint(size, ==, (256 * 1024 * 1024) / (VHOST_LOG_PAGE * 8)); g_assert_cmpint(size, ==, (256 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));
@ -778,6 +782,7 @@ static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc)
qtest_quit(to); qtest_quit(to);
test_server_free(dest); test_server_free(dest);
g_free(uri); g_free(uri);
g_string_free(dest_cmdline, true);
} }
static void wait_for_rings_started(TestServer *s, size_t count) static void wait_for_rings_started(TestServer *s, size_t count)