diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-07-25 13:30:00 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-30 14:47:32 +0100 |
| commit | d1fb710a9b88fa6e11476ba7536b1c5cc2a55b19 (patch) | |
| tree | 4820d92a828212d53b74d0e3d857582a60fbf55d /hw/arm | |
| parent | 758b71f7a3855cc8a3e3ae120b70294fa1502835 (diff) | |
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>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/sysbus-fdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 0d4c75702c..43d6a7bb48 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -107,6 +107,7 @@ static void copy_properties_from_host(HostProperty *props, int nb_props, /* mandatory property not found: bail out */ exit(1); } + err = NULL; } } } |