[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 13/15] qapi: Test failure in middle of array pars
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v6 13/15] qapi: Test failure in middle of array parse |
Date: |
Wed, 7 Oct 2015 20:00:48 -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>
---
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, 14 insertions(+)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 1ac5350..d7f7f8b 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -128,6 +128,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 6b1728c..8dbc3bf 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -693,6 +693,7 @@ static void test_visitor_in_errors(TestInputVisitorData
*data,
{
TestStruct *p = NULL;
Visitor *v;
+ strList *q = NULL;
v = visitor_input_test_init(data, "{ 'integer': false, 'boolean': 'foo',
'string': -42 }");
@@ -704,6 +705,15 @@ 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' ]");
+ /* 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, &data->err);
+ assert(q);
+ assert(data->err);
+ qapi_free_strList(q);
}
int main(int argc, char **argv)
--
2.4.3
- [Qemu-devel] [PATCH v6 00/15] post-introspection cleanups, subset C, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 10/15] qapi: Remove dead visitor code, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 05/15] qapi: Provide nicer array names in introspection, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 11/15] qapi: Plug leaks in test-qmp-*, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 01/15] qapi: Move empty-enum to compile-time test, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 03/15] qapi: Drop redundant flat-union-reverse-define test, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 15/15] qapi: Simplify visits of optional fields, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 08/15] qapi: Simplify visiting of alternate types, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 02/15] qapi: Drop redundant returns-int test, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 13/15] qapi: Test failure in middle of array parse,
Eric Blake <=
- [Qemu-devel] [PATCH v6 06/15] qapi-introspect: Guarantee particular sorting, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 04/15] qapi: Use generated TestStruct machinery in tests, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 07/15] qapi: Change alternate layout to use 'type', Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 14/15] qapi: More tests of input arrays, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 09/15] qapi: Fix alternates that accept 'number' but not 'int', Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 12/15] qapi: Simplify error testing in test-qmp-*, Eric Blake, 2015/10/08
- Re: [Qemu-devel] [PATCH v6 00/15] post-introspection cleanups, subset C, Eric Blake, 2015/10/16