[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/10] qapi: allow freeing partially-allocated objec
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/10] qapi: allow freeing partially-allocated objects |
Date: |
Thu, 22 Mar 2012 12:51:07 +0100 |
Objects going through the dealloc visitor can be only partially allocated.
Detect the situation and avoid a segfault. This also helps with the
input visitor, when there are errors.
Signed-off-by: Paolo Bonzini <address@hidden>
---
scripts/qapi-visit.py | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index b242315..a85fb76 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -65,6 +65,9 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const
char *name, Error **
return;
}
visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s),
errp);
+ if (obj && !*obj) {
+ goto end;
+ }
''',
name=name)
push_indent()
@@ -72,6 +75,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const
char *name, Error **
pop_indent()
ret += mcgen('''
+end:
visit_end_struct(m, errp);
}
''')
@@ -122,6 +126,9 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const
char *name, Error **
return;
}
visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s),
&err);
+ if (obj && !*obj) {
+ goto end;
+ }
visit_type_%(name)sKind(m, &(*obj)->kind, "type", &err);
if (err) {
error_propagate(errp, err);
--
1.7.9.1
- [Qemu-devel] [PATCH 00/10] QAPI minor fixes and strict mode, Paolo Bonzini, 2012/03/22
- [Qemu-devel] [PATCH 02/10] qapi: fail hard on stack imbalance, Paolo Bonzini, 2012/03/22
- [Qemu-devel] [PATCH 01/10] qapi: add a test case for type errors, Paolo Bonzini, 2012/03/22
- [Qemu-devel] [PATCH 04/10] qapi: shortcut visits on errors, Paolo Bonzini, 2012/03/22
- [Qemu-devel] [PATCH 03/10] qapi: fix memory leak on error, Paolo Bonzini, 2012/03/22
- [Qemu-devel] [PATCH 05/10] qapi: allow freeing partially-allocated objects,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/10] qapi: simplify qmp_input_next_list, Paolo Bonzini, 2012/03/22
[Qemu-devel] [PATCH 08/10] qapi: add strict mode to input visitor, Paolo Bonzini, 2012/03/22
[Qemu-devel] [PATCH 07/10] qapi: place outermost object on qiv stack, Paolo Bonzini, 2012/03/22