[Qemu-commits] [qemu/qemu] a0c7b9: qapi: Fix crash on missing enum member name

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: a0c7b99bf75d85b616fa219a7d866fc72970f327
      
https://github.com/qemu/qemu/commit/a0c7b99bf75d85b616fa219a7d866fc72970f327
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-07-15 (Thu, 15 Jul 2021)

  Changed paths:
    M scripts/qapi/expr.py
    A tests/qapi-schema/enum-dict-no-name.err
    A tests/qapi-schema/enum-dict-no-name.json
    A tests/qapi-schema/enum-dict-no-name.out

  Log Message:
  -----------
  qapi: Fix crash on missing enum member name

New test case enum-dict-no-name.json crashes:

    $ python3 scripts/qapi-gen.py tests/qapi-schema/enum-dict-no-name.json
    Traceback (most recent call last):
    [...]
      File "/work/armbru/qemu/scripts/qapi/expr.py", line 458, in check_enum
        member_name = member['name']
    KeyError: 'name'

Root cause: we try to retrieve member 'name' before we check for
missing members.  With that fixed, we get the expected error "'data'
member misses key 'name'".

Fixes: 0825f62c842f2c07c5471391c6d7fd3f4fe83732
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210616072121.626431-1-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>


  Commit: 9ad4c7c9b63f89c308fd988d509bed1389953c8b
      
https://github.com/qemu/qemu/commit/9ad4c7c9b63f89c308fd988d509bed1389953c8b
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-16 (Fri, 16 Jul 2021)

  Changed paths:
    M scripts/qapi/expr.py
    A tests/qapi-schema/enum-dict-no-name.err
    A tests/qapi-schema/enum-dict-no-name.json
    A tests/qapi-schema/enum-dict-no-name.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-07-15' into 
staging

QAPI patches patches for 2021-07-15

# gpg: Signature made Thu 15 Jul 2021 13:30:14 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2021-07-15:
  qapi: Fix crash on missing enum member name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/65388f404492...9ad4c7c9b63f