[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v4 21/29] qapi: Test failure in middle of array
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH RFC v4 21/29] qapi: Test failure in middle of array parse |
Date: |
Wed, 9 Sep 2015 22:06:23 -0600 |
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.
Signed-off-by: Eric Blake <address@hidden>
---
scripts/qapi-visit.py | 4 ++++
tests/test-qmp-input-visitor.c | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 81527ce..ac19d9d 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -161,6 +161,10 @@ void visit_type_%(c_name)s(Visitor *m, %(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 *m, %(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 67e4d17..03cad64 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -819,6 +819,7 @@ 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 }");
@@ -829,9 +830,21 @@ static void test_visitor_in_errors(TestInputVisitorData
*data,
g_assert(p->string == NULL);
error_free(err);
+ err = NULL;
g_free(p->string);
g_free(p);
visitor_input_teardown(data, NULL);
+
+ v = visitor_input_test_init(data, "[ '1', '2', false, '3' ]");
+ /* FIXME - a failed parse should not leave a partially-allocated
+ * array for us to clean up; this could cause callers to leak
+ * memory. */
+ visit_type_strList(v, &q, NULL, &err);
+ assert(q);
+ assert(err);
+ qapi_free_strList(q);
+ error_free(err);
+ visitor_input_teardown(data, NULL);
}
int main(int argc, char **argv)
--
2.4.3
- [Qemu-devel] [PATCH RFC v4 08/29] qapi: Simplify visiting of alternate types, (continued)
- [Qemu-devel] [PATCH RFC v4 08/29] qapi: Simplify visiting of alternate types, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 12/29] qapi: Use consistent generated code patterns, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 17/29] qapi: Drop useless 'data' member of unions, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 11/29] qapi: Don't pass pre-existing error to later call, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 14/29] qapi: Rework deallocation of partial struct, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 10/29] qapi: Fix alternates that accept 'number' but not 'int', Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 13/29] qapi: Add tests for empty unions, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 16/29] qapi: Forbid empty unions and useless alternates, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 15/29] qapi: Avoid use of 'data' member of qapi unions, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 18/29] qapi: Remove dead visitor code, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 21/29] qapi: Test failure in middle of array parse,
Eric Blake <=
- [Qemu-devel] [PATCH RFC v4 19/29] qapi: Document visitor interfaces, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 20/29] qapi: Plug leaks in test-qmp-input-visitor, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 22/29] qapi: Change visit_type_FOO() to no longer return partial objects, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 03/29] qapi: use 'type' in generated C code to match QMP union wire form, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 24/29] qapi: Implement boxed structs for commands/events, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 23/29] qapi: Plumb in 'box' to qapi generator lower levels, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 25/29] qapi: Support boxed unions, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 26/29] qapi: Clean up qapi.py per pep8, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 29/29] net: Complete qapi-fication of netdev_add, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 28/29] net: Use correct type for bool flag, Eric Blake, 2015/09/10