From: Dehan Meng <demeng@redhat.com>
To: qemu-devel@nongnu.org
Cc: demeng@redhat.com, kkostiuk@redhat.com, michael.roth@amd.com,
peter.maydell@linaro.org, berrange@redhat.com
Subject: [PATCH v4 3/5] qemu-ga: Avoiding freeing line prematurely
Date: Tue, 22 Oct 2024 22:29:46 +0800 [thread overview]
Message-ID: <20241022142948.531325-4-demeng@redhat.com> (raw)
In-Reply-To: <20241022142948.531325-1-demeng@redhat.com>
It's now only freed at the end of the function.
Signed-off-by: Dehan Meng <demeng@redhat.com>
---
qga/commands-linux.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index 32bf1b8ce7..c6bda78de6 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2137,8 +2137,7 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
is_ipv6 = (i == 1);
fp = fopen(routeFiles[i], "r");
if (fp == NULL) {
- error_setg_errno(errp, errno, "open(\"%s\")", routeFiles[i]);
- free(line);
+ error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]);
continue;
}
@@ -2226,9 +2225,8 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
QAPI_LIST_APPEND(tail, route);
}
- free(line);
fclose(fp);
}
-
+ free(line);
return head;
}
--
2.40.1
next prev parent reply other threads:[~2024-10-22 14:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-22 14:29 [PATCH v4 0/5] qemu-ga: Hanle memory leak and simplify code Dehan Meng
2024-10-22 14:29 ` [PATCH v4 1/5] qemu-ga: 'Null' check for mandatory parameters Dehan Meng
2024-10-25 12:48 ` Daniel P. Berrangé
2024-10-28 1:49 ` Dehan Meng
2024-10-22 14:29 ` [PATCH v4 2/5] qemu-ga: Initialize correctly so getline works properly Dehan Meng
2024-10-22 14:29 ` Dehan Meng [this message]
2024-10-22 14:29 ` [PATCH v4 4/5] qemu-ga: For correcting code style Dehan Meng
2024-10-22 14:29 ` [PATCH v4 5/5] qemu-ga: Replace g_new0() with g_autoptr() Dehan Meng
2024-10-25 12:50 ` Daniel P. Berrangé
2024-10-28 1:49 ` Dehan Meng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241022142948.531325-4-demeng@redhat.com \
--to=demeng@redhat.com \
--cc=berrange@redhat.com \
--cc=kkostiuk@redhat.com \
--cc=michael.roth@amd.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).