[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 09/30] qapi: Test failure in middle of array par
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v10 09/30] qapi: Test failure in middle of array parse |
Date: |
Thu, 5 Nov 2015 23:35:33 -0700 |
Our generated list visitors have the same problem as has been
mentioned elsewhere (see commit 2f52e20): they allocate data
even on failure. An upcoming patch will correct things to
provide saner guarantees, but first we need to expose the
behavior in the testsuite to ensure we aren't introducing any
memory usage bugs.
There are more test cases throughout the test-qmp-input-* tests
that already deal with partial allocation; a later commit will
clean up all visit_type_FOO(), without marking all of the tests
with FIXME at this time.
Signed-off-by: Eric Blake <address@hidden>
---
v10: rebase to earlier changes, more commit message text
v9: move earlier in series (was 15/17)
v8: no change
v7: no change
v6: rebase onto earlier gen_err_check() and testsuite improvements
---
scripts/qapi-visit.py | 4 ++++
tests/test-qmp-input-visitor.c | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index f40c3c7..3ef5c16 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -138,6 +138,10 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj,
const char *name, Error
def gen_visit_list(name, element_type):
+ # FIXME: if *obj is NULL on entry, and the first visit_next_list()
+ # assigns to *obj, while a later one fails, we should clean up *obj
+ # rather than leaving it non-NULL. As currently written, the caller must
+ # call qapi_free_FOOList() to avoid a memory leak of the partial FOOList.
return mcgen('''
void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name,
Error **errp)
diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index 2b59b6f..b9b0c31 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -699,8 +699,10 @@ static void test_visitor_in_errors(TestInputVisitorData
*data,
TestStruct *p = NULL;
Error *err = NULL;
Visitor *v;
+ strList *q = NULL;
- v = visitor_input_test_init(data, "{ 'integer': false, 'boolean': 'foo',
'string': -42 }");
+ v = visitor_input_test_init(data, "{ 'integer': false, 'boolean': 'foo', "
+ "'string': -42 }");
visit_type_TestStruct(v, &p, NULL, &err);
error_free_or_abort(&err);
@@ -710,6 +712,12 @@ static void test_visitor_in_errors(TestInputVisitorData
*data,
g_free(p->string);
g_free(p);
+
+ v = visitor_input_test_init(data, "[ '1', '2', false, '3' ]");
+ visit_type_strList(v, &q, NULL, &err);
+ error_free_or_abort(&err);
+ assert(q);
+ qapi_free_strList(q);
}
int main(int argc, char **argv)
--
2.4.3
- [Qemu-devel] [PATCH v10 00/30] qapi member collision (post-introspection cleanups, subset C'), Eric Blake, 2015/11/06
- [Qemu-devel] [PATCH v10 10/30] qapi: More tests of input arrays, Eric Blake, 2015/11/06
- [Qemu-devel] [PATCH v10 09/30] qapi: Test failure in middle of array parse,
Eric Blake <=
- [Qemu-devel] [PATCH v10 03/30] qobject: Protect against use-after-free in qobject_decref(), Eric Blake, 2015/11/06
- [Qemu-devel] [PATCH v10 08/30] qapi: More tests of alternate output, Eric Blake, 2015/11/06
- [Qemu-devel] [PATCH v10 02/30] qapi: Strengthen test of TestStructList, Eric Blake, 2015/11/06
- [Qemu-devel] [PATCH v10 04/30] qapi: Share test_init code in test-qmp-input*, Eric Blake, 2015/11/06
- [Qemu-devel] [PATCH v10 01/30] qapi: Use generated TestStruct machinery in tests, Eric Blake, 2015/11/06
- [Qemu-devel] [PATCH v10 14/30] qapi-types: Consolidate gen_struct() and gen_union(), Eric Blake, 2015/11/06
- [Qemu-devel] [PATCH v10 12/30] qapi-introspect: Document lack of sorting, Eric Blake, 2015/11/06