qapi: Reject blank 'if' conditions in addition to empty ones
"'if': 'COND'" generates "#if COND". We reject empty COND because it won't compile. Blank COND won't compile any better, so reject that, too. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190914153506.2151-12-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
887a2069f7
commit
c2c7065e17
@ -742,8 +742,9 @@ def check_if(expr, info):
|
||||
if not isinstance(ifcond, str):
|
||||
raise QAPISemError(
|
||||
info, "'if' condition must be a string or a list of strings")
|
||||
if ifcond == '':
|
||||
raise QAPISemError(info, "'if' condition '' makes no sense")
|
||||
if ifcond.strip() == '':
|
||||
raise QAPISemError(info, "'if' condition '%s' makes no sense"
|
||||
% ifcond)
|
||||
|
||||
ifcond = expr.get('if')
|
||||
if ifcond is None:
|
||||
|
@ -1 +1 @@
|
||||
tests/qapi-schema/bad-if-list.json:2: 'if' condition '' makes no sense
|
||||
tests/qapi-schema/bad-if-list.json:2: 'if' condition ' ' makes no sense
|
||||
|
@ -1,3 +1,3 @@
|
||||
# check invalid 'if' content
|
||||
{ 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },
|
||||
'if': ['foo', ''] }
|
||||
'if': ['foo', ' '] }
|
||||
|
Loading…
Reference in New Issue
Block a user