diff options
| -rw-r--r-- | futility/updater.c | 7 | ||||
| -rw-r--r-- | futility/updater_quirks.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/futility/updater.c b/futility/updater.c index f4e793b3..4ddf53db 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -648,12 +648,19 @@ int load_system_firmware(struct updater_config *cfg, */ void free_firmware_image(struct firmware_image *image) { + /* + * The programmer is not allocated by load_firmware_image and must be + * preserved explicitly. + */ + const char *programmer = image->programmer; + free(image->data); free(image->file_name); free(image->ro_version); free(image->rw_version_a); free(image->rw_version_b); memset(image, 0, sizeof(*image)); + image->programmer = programmer; } /* diff --git a/futility/updater_quirks.c b/futility/updater_quirks.c index 8c924a37..5480d3c6 100644 --- a/futility/updater_quirks.c +++ b/futility/updater_quirks.c @@ -53,11 +53,10 @@ static int write_image(const char *file_path, struct firmware_image *image) } /* Preserves meta data and reload image contents from given file path. */ -static int reload_firmware_image(const char *file_path, struct firmware_image *image) +static int reload_firmware_image(const char *file_path, + struct firmware_image *image) { - const char *programmer = image->programmer; free_firmware_image(image); - image->programmer = programmer; return load_firmware_image(image, file_path, NULL); } |