qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 v5 3/3] qemu-ga: Avoiding freeing line prematurely
Date: Wed,  6 Nov 2024 16:41:34 +0800	[thread overview]
Message-ID: <20241106084134.1133061-4-demeng@redhat.com> (raw)
In-Reply-To: <20241106084134.1133061-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 | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index 55c35bfc8f..70020621bf 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2138,8 +2138,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;
         }
 
@@ -2148,7 +2147,6 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
                 firstLine = 0;
                 continue;
             }
-            
             if (is_ipv6) {
                 char destination[33], source[33], next_hop[33];
                 int des_prefixlen, src_prefixlen, metric, refcnt, use, flags;
@@ -2215,9 +2213,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



  parent reply	other threads:[~2024-11-06  8:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-06  8:41 [PATCH v5 0/3] qemu-ga: Summarize and merge commits Dehan Meng
2024-11-06  8:41 ` [PATCH v5 1/3] qemu-ga: Add 'Null' check and Redefine 'route' Dehan Meng
2024-11-06 13:35   ` Daniel P. Berrangé
2024-11-06 16:43     ` Konstantin Kostiuk
2024-11-06 18:05   ` Konstantin Kostiuk
2024-11-06  8:41 ` [PATCH v5 2/3] qemu-ga: Optimize var declaration and definition Dehan Meng
2024-11-06 13:36   ` Daniel P. Berrangé
2024-11-06 16:44     ` Konstantin Kostiuk
2024-11-06  8:41 ` Dehan Meng [this message]
2024-11-06 13:38   ` [PATCH v5 3/3] qemu-ga: Avoiding freeing line prematurely Daniel P. Berrangé
2024-11-06 16:44     ` Konstantin Kostiuk
2024-11-06 18:07   ` Konstantin Kostiuk

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=20241106084134.1133061-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).