[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/20] qapi: Assert non-input visitors see only valid alternate ta
From: |
Markus Armbruster |
Subject: |
[PULL 16/20] qapi: Assert non-input visitors see only valid alternate tags |
Date: |
Thu, 30 Apr 2020 07:31:00 +0200 |
An alternate type's visit_type_FOO() fails when it runs into an
invalid ->type.
This is appropriate with an input visitor: visit_start_alternate()
sets ->type according to the input, and bad input can lead to bad
->type.
It should never happen with an output, clone or dealloc visitor: if it
did, the alternate being output, cloned or deallocated would be messed
up beyond repair. Assert that.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
scripts/qapi/visit.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py
index 678109dfb5..d5d7a1031f 100644
--- a/scripts/qapi/visit.py
+++ b/scripts/qapi/visit.py
@@ -232,6 +232,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name,
%(c_name)s **obj, Error
case QTYPE_NONE:
abort();
default:
+ assert(visit_is_input(v));
error_setg(&err, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"%(name)s");
/* Avoid passing invalid *obj to qapi_free_%(c_name)s() */
--
2.21.1
- [PULL 12/20] qapi: Fix Visitor contract for start_alternate(), (continued)
- [PULL 12/20] qapi: Fix Visitor contract for start_alternate(), Markus Armbruster, 2020/04/30
- [PULL 11/20] qapi: Assert incomplete object occurs only in dealloc visitor, Markus Armbruster, 2020/04/30
- [PULL 10/20] qapi: Polish prose in visitor.h, Markus Armbruster, 2020/04/30
- [PULL 14/20] qapi: Assert non-input visitors see only valid narrow integers, Markus Armbruster, 2020/04/30
- [PULL 20/20] qapi: Generate simpler marshalling code when no arguments, Markus Armbruster, 2020/04/30
- [PULL 04/20] qobject: Eliminate qdict_iter(), use qdict_first(), qdict_next(), Markus Armbruster, 2020/04/30
- [PULL 05/20] qemu-option: Clean up after the previous commit, Markus Armbruster, 2020/04/30
- [PULL 06/20] qapi: Belatedly update visitor.h's big comment for QAPI modules, Markus Armbruster, 2020/04/30
- [PULL 13/20] qapi: Assert output visitors see only valid enum values, Markus Armbruster, 2020/04/30
- [PULL 18/20] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/04/30
- [PULL 16/20] qapi: Assert non-input visitors see only valid alternate tags,
Markus Armbruster <=
- [PULL 15/20] qapi: Clean up visitor's recovery from input with invalid type, Markus Armbruster, 2020/04/30
- [PULL 07/20] qapi: Fix the virtual walk example in visitor.h's big comment, Markus Armbruster, 2020/04/30
- [PULL 19/20] qapi: Disallow qmp_marshal_FOO(NULL, ...), Markus Armbruster, 2020/04/30
- [PULL 17/20] qapi: Only input visitors can actually fail, Markus Armbruster, 2020/04/30
- Re: [PULL 00/20] QAPI patches for 2020-04-30, Peter Maydell, 2020/04/30