* [Qemu-devel] [PATCH] loader: fix potential memory leak
@ 2016-02-24 9:12 Cao jin
2016-02-25 8:09 ` Cao jin
2016-03-16 11:39 ` [Qemu-devel] " Michael Tokarev
0 siblings, 2 replies; 5+ messages in thread
From: Cao jin @ 2016-02-24 9:12 UTC (permalink / raw)
To: qemu-devel; +Cc: mjt
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
hw/core/loader.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 3a57415..24fea65 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -827,10 +827,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;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-trivial] [Qemu-devel] [PATCH] loader: fix potential memory leak
2016-02-24 9:12 [Qemu-devel] [PATCH] loader: fix potential memory leak Cao jin
@ 2016-02-25 8:09 ` Cao jin
2016-03-16 11:39 ` [Qemu-devel] " Michael Tokarev
1 sibling, 0 replies; 5+ messages in thread
From: Cao jin @ 2016-02-25 8:09 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, mjt
sorry, It just came to me that I forgot to cc qemu-trivial
On 02/24/2016 05:12 PM, Cao jin wrote:
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
> hw/core/loader.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 3a57415..24fea65 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -827,10 +827,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;
> }
>
>
--
Yours Sincerely,
Cao jin
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] loader: fix potential memory leak
@ 2016-02-25 8:09 ` Cao jin
0 siblings, 0 replies; 5+ messages in thread
From: Cao jin @ 2016-02-25 8:09 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, mjt
sorry, It just came to me that I forgot to cc qemu-trivial
On 02/24/2016 05:12 PM, Cao jin wrote:
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
> hw/core/loader.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 3a57415..24fea65 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -827,10 +827,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;
> }
>
>
--
Yours Sincerely,
Cao jin
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-trivial] [PATCH] loader: fix potential memory leak
2016-02-24 9:12 [Qemu-devel] [PATCH] loader: fix potential memory leak Cao jin
@ 2016-03-16 11:39 ` Michael Tokarev
2016-03-16 11:39 ` [Qemu-devel] " Michael Tokarev
1 sibling, 0 replies; 5+ messages in thread
From: Michael Tokarev @ 2016-03-16 11:39 UTC (permalink / raw)
To: Cao jin, qemu-devel; +Cc: qemu-trivial
24.02.2016 12:12, Cao jin wrote:
> + if (fw_dir) {
> + g_free(rom->fw_dir);
> + g_free(rom->fw_file);
> + }
Applied to -trivial, thanks!
/mjt
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-16 11:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-24 9:12 [Qemu-devel] [PATCH] loader: fix potential memory leak Cao jin
2016-02-25 8:09 ` [Qemu-trivial] " Cao jin
2016-02-25 8:09 ` Cao jin
2016-03-16 11:39 ` [Qemu-trivial] " Michael Tokarev
2016-03-16 11:39 ` [Qemu-devel] " Michael Tokarev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.