| Message ID | 20190914153506.2151-18-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qapi: Frontend fixes and cleanups | expand |
On 9/14/19 10:35 AM, Markus Armbruster wrote: > QAPISchemaObjectType.check() does nothing for types that have been > checked already. Except the "has been checked" predicate is broken > for empty types: self.members is [] then, which isn't true. The bug > is harmless, but fix it anyway: use self.member is not None instead. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > scripts/qapi/common.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com> > > diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py > index 7e79c42b6a..e2c87d1349 100644 > --- a/scripts/qapi/common.py > +++ b/scripts/qapi/common.py > @@ -1406,7 +1406,7 @@ class QAPISchemaObjectType(QAPISchemaType): > if self.members is False: # check for cycles > raise QAPISemError(self.info, > "Object %s contains itself" % self.name) > - if self.members: > + if self.members is not None: # already checked > return > self.members = False # mark as being checked > seen = OrderedDict() >
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 7e79c42b6a..e2c87d1349 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -1406,7 +1406,7 @@ class QAPISchemaObjectType(QAPISchemaType): if self.members is False: # check for cycles raise QAPISemError(self.info, "Object %s contains itself" % self.name) - if self.members: + if self.members is not None: # already checked return self.members = False # mark as being checked seen = OrderedDict()
QAPISchemaObjectType.check() does nothing for types that have been checked already. Except the "has been checked" predicate is broken for empty types: self.members is [] then, which isn't true. The bug is harmless, but fix it anyway: use self.member is not None instead. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- scripts/qapi/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)