]> git.proxmox.com Git - mirror_qemu.git/commit
hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 25 Jul 2018 11:30:00 +0000 (13:30 +0200)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 30 Jul 2018 13:47:32 +0000 (14:47 +0100)
commitd1fb710a9b88fa6e11476ba7536b1c5cc2a55b19
tree4820d92a828212d53b74d0e3d857582a60fbf55d
parent758b71f7a3855cc8a3e3ae120b70294fa1502835
hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()

When copy_properties_from_host() ignores the error for an optional
property, it frees the error, but fails to reset it.

Hence if two or more optional properties are missing, an assertion is
triggered:

    util/error.c:57: error_setv: Assertion `*errp == NULL' failed.

Fis this by resetting err to NULL after ignoring the error.

Fixes: 9481cf2e5f2f2bb6 ("hw/arm/sysbus-fdt: helpers for clock node generation")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Message-id: 20180725113000.11014-1-geert+renesas@glider.be
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/arm/sysbus-fdt.c