diff mbox series

[PULL,2/6] hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()

Message ID 20180730141748.430-3-peter.maydell@linaro.org
State Accepted
Commit d1fb710a9b88fa6e11476ba7536b1c5cc2a55b19
Headers show
Series target-arm queue | expand

Commit Message

Peter Maydell July 30, 2018, 2:17 p.m. UTC 
From: Geert Uytterhoeven <geert+renesas@glider.be>


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 | 1 +
 1 file changed, 1 insertion(+)

-- 
2.17.1
diff mbox series

Patch

diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 0d4c75702c3..43d6a7bb48d 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;
         }
     }
 }