diff options
| author | Markus Armbruster | 2020-04-24 10:43:33 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2020-04-30 07:26:40 +0200 |
| commit | c978bd5226f1ed73456ac468a7ed50af3d24dc84 (patch) | |
| tree | 0a375411a70f63073f52ce209d26324511b41896 /scripts/qapi | |
| parent | qapi: Assert non-input visitors see only valid narrow integers (diff) | |
| download | qemu-c978bd5226f1ed73456ac468a7ed50af3d24dc84.tar.gz qemu-c978bd5226f1ed73456ac468a7ed50af3d24dc84.tar.xz qemu-c978bd5226f1ed73456ac468a7ed50af3d24dc84.zip | |
qapi: Clean up visitor's recovery from input with invalid type
An alternate type's visit_type_FOO() fails when it runs into an
invalid ->type. If it's an input visit, we then need to free the the
object we got from visit_start_alternate(). We do that with
qapi_free_FOO(), which uses the dealloc visitor.
Trouble is that object is in a bad state: its ->type is invalid. So
the dealloc visitor will run into the same error again, and the error
recovery skips deallocating the alternate's (invalid) alternative.
Works, because qapi_free_FOO() ignores the error.
Avoid it instead: free the messed up object with by g_free().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200424084338.26803-11-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'scripts/qapi')
| -rw-r--r-- | scripts/qapi/visit.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index e3467b770b..678109dfb5 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -234,6 +234,9 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error default: error_setg(&err, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", "%(name)s"); + /* Avoid passing invalid *obj to qapi_free_%(c_name)s() */ + g_free(*obj); + *obj = NULL; } out_obj: visit_end_alternate(v, (void **)obj); |