[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/15] qapi: Clean up visitor's recovery from input with inval
From: |
Markus Armbruster |
Subject: |
[PATCH v2 10/15] qapi: Clean up visitor's recovery from input with invalid type |
Date: |
Fri, 24 Apr 2020 10:43:33 +0200 |
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 <address@hidden>
---
scripts/qapi/visit.py | 3 +++
1 file changed, 3 insertions(+)
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);
--
2.21.1
- [PATCH v2 04/15] qapi: Document @errp usage more thoroughly in visitor.h, (continued)
- [PATCH v2 04/15] qapi: Document @errp usage more thoroughly in visitor.h, Markus Armbruster, 2020/04/24
- [PATCH v2 02/15] qapi: Fix the virtual walk example in visitor.h's big comment, Markus Armbruster, 2020/04/24
- [PATCH v2 11/15] qapi: Assert non-input visitors see only valid alternate tags, Markus Armbruster, 2020/04/24
- [PATCH v2 13/15] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/04/24
- [PATCH v2 06/15] qapi: Assert incomplete object occurs only in dealloc visitor, Markus Armbruster, 2020/04/24
- [PATCH v2 09/15] qapi: Assert non-input visitors see only valid narrow integers, Markus Armbruster, 2020/04/24
- [PATCH v2 14/15] qapi: Disallow qmp_marshal_FOO(NULL, ...), Markus Armbruster, 2020/04/24
- [PATCH v2 10/15] qapi: Clean up visitor's recovery from input with invalid type,
Markus Armbruster <=
- [PATCH v2 15/15] qapi: Generate simpler marshalling code when no arguments, Markus Armbruster, 2020/04/24
- [PATCH v2 08/15] qapi: Assert output visitors see only valid enum values, Markus Armbruster, 2020/04/24
- [PATCH v2 12/15] qapi: Only input visitors can actually fail, Markus Armbruster, 2020/04/24
- [PATCH v2 07/15] qapi: Fix Visitor contract for start_alternate(), Markus Armbruster, 2020/04/24
- [PATCH v2 05/15] qapi: Polish prose in visitor.h, Markus Armbruster, 2020/04/24
- Re: [PATCH v2 00/15] qapi: Spring cleaning, no-reply, 2020/04/24
- Re: [PATCH v2 00/15] qapi: Spring cleaning, Markus Armbruster, 2020/04/29