Ping? It would be nice to see this patch get into master
to silence the coverity errors.
thanks
-- PMM
On Thu, 3 Oct 2019 at 18:05, Alistair Francis <alistair.fran...@wdc.com> wrote:
>
> Coverity (CID 1405786) thinks that there is a possible memory leak as
> we don't guarantee that the memory allocated from riscv_find_firmware()
> is freed. This is a false positive, but let's tidy up the code to fix
> the warning.
>
> Signed-off-by: Alistair Francis <alistair.fran...@wdc.com>
> Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
> Reviewed-by: Bin Meng <bmeng...@gmail.com>
> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> v2:
> - Fix commit typos
>
> hw/riscv/boot.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index 2e92fb0680..7fee98d2f8 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -38,7 +38,7 @@ void riscv_find_and_load_firmware(MachineState *machine,
> const char *default_machine_firmware,
> hwaddr firmware_load_addr)
> {
> - char *firmware_filename;
> + char *firmware_filename = NULL;
>
> if (!machine->firmware) {
> /*
> @@ -70,14 +70,11 @@ void riscv_find_and_load_firmware(MachineState *machine,
> * if no -bios option is set without breaking anything.
> */
> firmware_filename = riscv_find_firmware(default_machine_firmware);
> - } else {
> - firmware_filename = machine->firmware;
> - if (strcmp(firmware_filename, "none")) {
> - firmware_filename = riscv_find_firmware(firmware_filename);
> - }
> + } else if (strcmp(machine->firmware, "none")) {
> + firmware_filename = riscv_find_firmware(machine->firmware);
> }
>
> - if (strcmp(firmware_filename, "none")) {
> + if (firmware_filename) {
> /* If not "none" load the firmware */
> riscv_load_firmware(firmware_filename, firmware_load_addr);
> g_free(firmware_filename);
> --
> 2.23.0
