提交 d1fb710a 编写于 作者: G Geert Uytterhoeven 提交者: Peter Maydell

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: 9481cf2e ("hw/arm/sysbus-fdt: helpers for clock node generation")
Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
Message-id: 20180725113000.11014-1-geert+renesas@glider.be
Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
上级 758b71f7
......@@ -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;
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册