Edward O'Callaghan submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved
dummyflasher.c: Don't leak `emu_persistent_image`

Ensure `emu_persistent_image` doesn't end up leaking memory.

Change-Id: I76529973cefcc6a1472681e1f4da8239fcbf07a6
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54905
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
---
M dummyflasher.c
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dummyflasher.c b/dummyflasher.c
index 325263d..717f8d1 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -634,9 +634,8 @@
write_buf_to_file(emu_data->flashchip_contents,
emu_data->emu_chip_size,
emu_data->emu_persistent_image);
- free(emu_data->emu_persistent_image);
- emu_data->emu_persistent_image = NULL;
}
+ free(emu_data->emu_persistent_image);
free(emu_data->flashchip_contents);
}
#endif
@@ -1001,6 +1000,7 @@
if (read_buf_from_file(data->flashchip_contents, data->emu_chip_size,
data->emu_persistent_image)) {
msg_perr("Unable to read %s\n", data->emu_persistent_image);
+ free(data->emu_persistent_image);
free(data->flashchip_contents);
return 1;
}
@@ -1012,6 +1012,7 @@

dummy_init_out:
if (register_shutdown(dummy_shutdown, data)) {
+ free(data->emu_persistent_image);
free(data->flashchip_contents);
free(data);
return 1;

To view, visit change 54905. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I76529973cefcc6a1472681e1f4da8239fcbf07a6
Gerrit-Change-Number: 54905
Gerrit-PatchSet: 3
Gerrit-Owner: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-MessageType: merged