OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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: 9481cf2e5f ("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>
This commit is contained in:
Geert Uytterhoeven 2018-07-25 13:30:00 +02:00 committed by Peter Maydell
parent 758b71f7a3
commit d1fb710a9b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/arm/sysbus-fdt.c
View File

@ -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;
}
}
}