[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/16] qapi/expr.py: Check type of 'data' member
From: |
John Snow |
Subject: |
[PATCH 06/16] qapi/expr.py: Check type of 'data' member |
Date: |
Tue, 22 Sep 2020 17:13:03 -0400 |
Iterating over the members of data isn't going to work if it's not some
form of dict anyway, but for type safety, formalize it.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/expr.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 3f5af5f5e4..633f9b9172 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -247,6 +247,9 @@ def check_union(expr, info):
raise QAPISemError(info, "'discriminator' requires 'base'")
check_name_is_str(discriminator, info, "'discriminator'")
+ if not isinstance(members, dict):
+ raise QAPISemError(info, "'data' must be an object")
+
for (key, value) in members.items():
source = "'data' member '%s'" % key
check_name_str(key, info, source)
@@ -260,6 +263,10 @@ def check_alternate(expr, info):
if not members:
raise QAPISemError(info, "'data' must not be empty")
+
+ if not isinstance(members, dict):
+ raise QAPISemError(info, "'data' must be an object")
+
for (key, value) in members.items():
source = "'data' member '%s'" % key
check_name_str(key, info, source)
--
2.26.2
Re: [PATCH 03/16] qapi/expr.py: constrain incoming expression types, Cleber Rosa, 2020/09/24
[PATCH 02/16] qapi/expr.py: Check for dict instead of OrderedDict, John Snow, 2020/09/22
[PATCH 05/16] qapi/expr.py: move string check upwards in check_type, John Snow, 2020/09/22
[PATCH 06/16] qapi/expr.py: Check type of 'data' member,
John Snow <=
[PATCH 07/16] qapi/expr.py: Add casts in a few select cases, John Snow, 2020/09/22
[PATCH 08/16] qapi/expr.py: add type hint annotations, John Snow, 2020/09/22