diff options
| author | Peter Maydell | 2016-05-19 10:27:28 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-05-19 10:27:28 +0200 |
| commit | 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3 (patch) | |
| tree | 93a1691d7a5d90ddbb77a3210299089fcede4947 /hw/core | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160517' into staging (diff) | |
| parent | Fix some typos found by codespell (diff) | |
| download | qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.gz qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.xz qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging
trivial patches for 2016-05-18
# gpg: Signature made Wed 18 May 2016 13:04:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2016-05-18:
Fix some typos found by codespell
9p: drop unused declaration from coth.h
smbios: fix typo
accel: make configure_accelerator return void
configure: Use uniform description for devel packages
ipack: Update e-mail address
util: fix comment typos
qdict: fix unbounded stack warning for qdict_array_entries
Fix typo in variable name (found and fixed by codespell)
vl: fix comment about when parsing cpu definitions
loader: fix potential memory leak
remove comment for nonexistent structure member
s390: remove misleading comment
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/loader.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c index c0499571c3..53e0e41554 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -914,10 +914,16 @@ int rom_add_file(const char *file, const char *fw_dir, err: if (fd != -1) close(fd); + g_free(rom->data); g_free(rom->path); g_free(rom->name); + if (fw_dir) { + g_free(rom->fw_dir); + g_free(rom->fw_file); + } g_free(rom); + return -1; } |