diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-03-22 12:51:07 +0100 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2012-03-27 09:14:06 -0300 |
commit | 69b50071d8dc1b4e06724bb73cda8e2f10fe30c7 (patch) | |
tree | 1ae6144a524792cba5f5817382a77d8d1aafde2f /scripts | |
parent | b6f0474fc0fe6f81d93d620a5d24bc30b22d561b (diff) | |
download | qemu-69b50071d8dc1b4e06724bb73cda8e2f10fe30c7.zip qemu-69b50071d8dc1b4e06724bb73cda8e2f10fe30c7.tar.gz qemu-69b50071d8dc1b4e06724bb73cda8e2f10fe30c7.tar.bz2 |
qapi: allow freeing partially-allocated objects
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 <pbonzini@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r-- | 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 4297621..31d50a6 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); |