* [Qemu-devel] [PATCH v2] Fix some memory leaks in test-visitor-serialization
@ 2013-03-28 11:22 Stefan Berger
2013-03-28 13:32 ` Stefan Hajnoczi
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Berger @ 2013-03-28 11:22 UTC (permalink / raw)
To: Michael Roth, qemu-trivial; +Cc: Stefan Hajnoczi, qemu-devel
This patch fixes some of the memory leaks in test-visitor-serialization
but not all of them.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
v1->v2: call qobject_decref(obj) earlier
---
tests/test-visitor-serialization.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
Index: qemu-git.pt/tests/test-visitor-serialization.c
===================================================================
--- qemu-git.pt.orig/tests/test-visitor-serialization.c
+++ qemu-git.pt/tests/test-visitor-serialization.c
@@ -258,6 +258,7 @@ static void test_primitives(gconstpointe
g_assert(pt_copy != NULL);
if (pt->type == PTYPE_STRING) {
g_assert_cmpstr(pt->value.string, ==, pt_copy->value.string);
+ g_free((char *)pt_copy->value.string);
} else if (pt->type == PTYPE_NUMBER) {
/* we serialize with %f for our reference visitors, so rather
than fuzzy
* floating math to test "equality", just compare the
formatted values
@@ -275,6 +276,7 @@ static void test_primitives(gconstpointe
ops->cleanup(serialize_data);
g_free(args);
+ g_free(pt_copy);
}
static void test_struct(gconstpointer opaque)
@@ -660,6 +662,7 @@ static void qmp_deserialize(void **nativ
QDECREF(output_json);
d->qiv = qmp_input_visitor_new(obj);
+ qobject_decref(obj);
visit(qmp_input_get_visitor(d->qiv), native_out, errp);
}
@@ -668,9 +671,12 @@ static void qmp_cleanup(void *datap)
QmpSerializeData *d = datap;
qmp_output_visitor_cleanup(d->qov);
qmp_input_visitor_cleanup(d->qiv);
+
+ g_free(d);
}
typedef struct StringSerializeData {
+ char *string;
StringOutputVisitor *sov;
StringInputVisitor *siv;
} StringSerializeData;
@@ -690,15 +696,19 @@ static void string_deserialize(void **na
{
StringSerializeData *d = datap;
- d->siv = string_input_visitor_new(string_output_get_string(d->sov));
+ d->string = string_output_get_string(d->sov);
+ d->siv = string_input_visitor_new(d->string);
visit(string_input_get_visitor(d->siv), native_out, errp);
}
static void string_cleanup(void *datap)
{
StringSerializeData *d = datap;
+
string_output_visitor_cleanup(d->sov);
string_input_visitor_cleanup(d->siv);
+ g_free(d->string);
+ g_free(d);
}
/* visitor registration, test harness */
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v2] Fix some memory leaks in test-visitor-serialization
2013-03-28 11:22 [Qemu-devel] [PATCH v2] Fix some memory leaks in test-visitor-serialization Stefan Berger
@ 2013-03-28 13:32 ` Stefan Hajnoczi
2013-03-28 14:12 ` [Qemu-devel] [REPOST] " Stefan Berger
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Hajnoczi @ 2013-03-28 13:32 UTC (permalink / raw)
To: Stefan Berger; +Cc: qemu-trivial, Michael Roth, qemu-devel
On Thu, Mar 28, 2013 at 07:22:12AM -0400, Stefan Berger wrote:
> This patch fixes some of the memory leaks in
> test-visitor-serialization but not all of them.
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
>
> ---
> v1->v2: call qobject_decref(obj) earlier
>
> ---
> tests/test-visitor-serialization.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> Index: qemu-git.pt/tests/test-visitor-serialization.c
> ===================================================================
> --- qemu-git.pt.orig/tests/test-visitor-serialization.c
> +++ qemu-git.pt/tests/test-visitor-serialization.c
> @@ -258,6 +258,7 @@ static void test_primitives(gconstpointe
> g_assert(pt_copy != NULL);
> if (pt->type == PTYPE_STRING) {
> g_assert_cmpstr(pt->value.string, ==, pt_copy->value.string);
> + g_free((char *)pt_copy->value.string);
> } else if (pt->type == PTYPE_NUMBER) {
> /* we serialize with %f for our reference visitors, so
> rather than fuzzy
> * floating math to test "equality", just compare the
> formatted values
The patch is line-wrapped. Please fix your mail client configuration,
git-am(1) refuses to apply automatically.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread* [Qemu-devel] [REPOST] [PATCH v2] Fix some memory leaks in test-visitor-serialization
2013-03-28 13:32 ` Stefan Hajnoczi
@ 2013-03-28 14:12 ` Stefan Berger
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Berger @ 2013-03-28 14:12 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-trivial, Michael Roth, qemu-devel
This patch fixes some of the memory leaks in test-visitor-serialization but not all of them.
Signed-off-by: Stefan Berger<stefanb@linux.vnet.ibm.com>
---
tests/test-visitor-serialization.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
Index: qemu-git.pt/tests/test-visitor-serialization.c
===================================================================
--- qemu-git.pt.orig/tests/test-visitor-serialization.c
+++ qemu-git.pt/tests/test-visitor-serialization.c
@@ -258,6 +258,7 @@ static void test_primitives(gconstpointe
g_assert(pt_copy != NULL);
if (pt->type == PTYPE_STRING) {
g_assert_cmpstr(pt->value.string, ==, pt_copy->value.string);
+ g_free((char *)pt_copy->value.string);
} else if (pt->type == PTYPE_NUMBER) {
/* we serialize with %f for our reference visitors, so rather
than fuzzy
* floating math to test "equality", just compare the
formatted values
@@ -275,6 +276,7 @@ static void test_primitives(gconstpointe
ops->cleanup(serialize_data);
g_free(args);
+ g_free(pt_copy);
}
static void test_struct(gconstpointer opaque)
@@ -660,6 +662,7 @@ static void qmp_deserialize(void **nativ
QDECREF(output_json);
d->qiv = qmp_input_visitor_new(obj);
+ qobject_decref(obj);
visit(qmp_input_get_visitor(d->qiv), native_out, errp);
}
@@ -668,9 +671,12 @@ static void qmp_cleanup(void *datap)
QmpSerializeData *d = datap;
qmp_output_visitor_cleanup(d->qov);
qmp_input_visitor_cleanup(d->qiv);
+
+ g_free(d);
}
typedef struct StringSerializeData {
+ char *string;
StringOutputVisitor *sov;
StringInputVisitor *siv;
} StringSerializeData;
@@ -690,15 +696,19 @@ static void string_deserialize(void **na
{
StringSerializeData *d = datap;
- d->siv = string_input_visitor_new(string_output_get_string(d->sov));
+ d->string = string_output_get_string(d->sov);
+ d->siv = string_input_visitor_new(d->string);
visit(string_input_get_visitor(d->siv), native_out, errp);
}
static void string_cleanup(void *datap)
{
StringSerializeData *d = datap;
+
string_output_visitor_cleanup(d->sov);
string_input_visitor_cleanup(d->siv);
+ g_free(d->string);
+ g_free(d);
}
/* visitor registration, test harness */
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-28 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-28 11:22 [Qemu-devel] [PATCH v2] Fix some memory leaks in test-visitor-serialization Stefan Berger
2013-03-28 13:32 ` Stefan Hajnoczi
2013-03-28 14:12 ` [Qemu-devel] [REPOST] " Stefan Berger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).