falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test-visitor-serialization: Fix some memory leaks 

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>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Berger 2013-03-28 11:18:40 -04:00 committed by Stefan Hajnoczi
parent d05ef16045
commit 2bd01ac1e2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test-visitor-serialization.c
View File

@ -258,6 +258,7 @@ static void test_primitives(gconstpointer opaque)
g_assert(pt_copy != NULL); g_assert(pt_copy != NULL);
if (pt->type == PTYPE_STRING) { if (pt->type == PTYPE_STRING) {
g_assert_cmpstr(pt->value.string, ==, pt_copy->value.string); g_assert_cmpstr(pt->value.string, ==, pt_copy->value.string);
g_free((char *)pt_copy->value.string);
} else if (pt->type == PTYPE_NUMBER) { } else if (pt->type == PTYPE_NUMBER) {
/* we serialize with %f for our reference visitors, so rather than fuzzy /* we serialize with %f for our reference visitors, so rather than fuzzy
* floating math to test "equality", just compare the formatted values * floating math to test "equality", just compare the formatted values
@ -275,6 +276,7 @@ static void test_primitives(gconstpointer opaque)
ops->cleanup(serialize_data); ops->cleanup(serialize_data);
g_free(args); g_free(args);
g_free(pt_copy);
} }
static void test_struct(gconstpointer opaque) static void test_struct(gconstpointer opaque)
@ -660,6 +662,7 @@ static void qmp_deserialize(void **native_out, void *datap,
QDECREF(output_json); QDECREF(output_json);
d->qiv = qmp_input_visitor_new(obj); d->qiv = qmp_input_visitor_new(obj);
qobject_decref(obj);
visit(qmp_input_get_visitor(d->qiv), native_out, errp); visit(qmp_input_get_visitor(d->qiv), native_out, errp);
} }
@ -668,9 +671,12 @@ static void qmp_cleanup(void *datap)
QmpSerializeData *d = datap; QmpSerializeData *d = datap;
qmp_output_visitor_cleanup(d->qov); qmp_output_visitor_cleanup(d->qov);
qmp_input_visitor_cleanup(d->qiv); qmp_input_visitor_cleanup(d->qiv);
g_free(d);
} }
typedef struct StringSerializeData { typedef struct StringSerializeData {
char *string;
StringOutputVisitor *sov; StringOutputVisitor *sov;
StringInputVisitor *siv; StringInputVisitor *siv;
} StringSerializeData; } StringSerializeData;
@ -690,15 +696,19 @@ static void string_deserialize(void **native_out, void *datap,
{ {
StringSerializeData *d = datap; 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); visit(string_input_get_visitor(d->siv), native_out, errp);
} }
static void string_cleanup(void *datap) static void string_cleanup(void *datap)
{ {
StringSerializeData *d = datap; StringSerializeData *d = datap;
string_output_visitor_cleanup(d->sov); string_output_visitor_cleanup(d->sov);
string_input_visitor_cleanup(d->siv); string_input_visitor_cleanup(d->siv);
g_free(d->string);
g_free(d);
} }
/* visitor registration, test harness */ /* visitor registration, test harness */