diff mbox

[v2,2/3] qom/object.c: fix string_output_get_string() memory leak

Message ID 1407126079-23804-3-git-send-email-chen.fan.fnst@cn.fujitsu.com
State New
Headers show

Commit Message

chenfan Aug. 4, 2014, 4:21 a.m. UTC 
string_output_get_string() uses g_string_free(str, false) to
transfer the 'str' pointer to callers and never free it.

Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
---
 hmp.c        |  6 ++++--
 qom/object.c | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

Comments

Hu Tao Aug. 4, 2014, 7:30 a.m. UTC | #1 
On Mon, Aug 04, 2014 at 12:21:18PM +0800, Chen Fan wrote:
> string_output_get_string() uses g_string_free(str, false) to
> transfer the 'str' pointer to callers and never free it.
> 
> Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>

Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>

> ---
>  hmp.c        |  6 ++++--
>  qom/object.c | 12 ++++++++++--
>  2 files changed, 14 insertions(+), 4 deletions(-)
> 
> diff --git a/hmp.c b/hmp.c
> index 4d1838e..ba40c75 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1687,6 +1687,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
>      MemdevList *memdev_list = qmp_query_memdev(&err);
>      MemdevList *m = memdev_list;
>      StringOutputVisitor *ov;
> +    char *str;
>      int i = 0;
>  
>  
> @@ -1704,9 +1705,10 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
>                         m->value->prealloc ? "true" : "false");
>          monitor_printf(mon, "  policy: %s\n",
>                         HostMemPolicy_lookup[m->value->policy]);
> -        monitor_printf(mon, "  host nodes: %s\n",
> -                       string_output_get_string(ov));
> +        str = string_output_get_string(ov);
> +        monitor_printf(mon, "  host nodes: %s\n", str);
>  
> +        g_free(str);
>          string_output_visitor_cleanup(ov);
>          m = m->next;
>          i++;
> diff --git a/qom/object.c b/qom/object.c
> index 0e8267b..e5aed60 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -948,14 +948,18 @@ int object_property_get_enum(Object *obj, const char *name,
>  {
>      StringOutputVisitor *sov;
>      StringInputVisitor *siv;
> +    char *str;
>      int ret;
>  
>      sov = string_output_visitor_new(false);
>      object_property_get(obj, string_output_get_visitor(sov), name, errp);
> -    siv = string_input_visitor_new(string_output_get_string(sov));
> +    str = string_output_get_string(sov);
> +    siv = string_input_visitor_new(str);
>      string_output_visitor_cleanup(sov);
>      visit_type_enum(string_input_get_visitor(siv),
>                      &ret, strings, NULL, name, errp);
> +
> +    g_free(str);
>      string_input_visitor_cleanup(siv);
>  
>      return ret;
> @@ -966,13 +970,17 @@ void object_property_get_uint16List(Object *obj, const char *name,
>  {
>      StringOutputVisitor *ov;
>      StringInputVisitor *iv;
> +    char *str;
>  
>      ov = string_output_visitor_new(false);
>      object_property_get(obj, string_output_get_visitor(ov),
>                          name, errp);
> -    iv = string_input_visitor_new(string_output_get_string(ov));
> +    str = string_output_get_string(ov);
> +    iv = string_input_visitor_new(str);
>      visit_type_uint16List(string_input_get_visitor(iv),
>                            list, NULL, errp);
> +
> +    g_free(str);
>      string_output_visitor_cleanup(ov);
>      string_input_visitor_cleanup(iv);
>  }
> -- 
> 1.9.3
>
Peter Crosthwaite Aug. 4, 2014, 9:14 a.m. UTC | #2 
On Mon, Aug 4, 2014 at 2:21 PM, Chen Fan <chen.fan.fnst@cn.fujitsu.com> wrote:
> string_output_get_string() uses g_string_free(str, false) to
> transfer the 'str' pointer to callers and never free it.
>
> Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

> ---
>  hmp.c        |  6 ++++--
>  qom/object.c | 12 ++++++++++--
>  2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index 4d1838e..ba40c75 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1687,6 +1687,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
>      MemdevList *memdev_list = qmp_query_memdev(&err);
>      MemdevList *m = memdev_list;
>      StringOutputVisitor *ov;
> +    char *str;
>      int i = 0;
>
>
> @@ -1704,9 +1705,10 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
>                         m->value->prealloc ? "true" : "false");
>          monitor_printf(mon, "  policy: %s\n",
>                         HostMemPolicy_lookup[m->value->policy]);
> -        monitor_printf(mon, "  host nodes: %s\n",
> -                       string_output_get_string(ov));
> +        str = string_output_get_string(ov);
> +        monitor_printf(mon, "  host nodes: %s\n", str);
>
> +        g_free(str);
>          string_output_visitor_cleanup(ov);
>          m = m->next;
>          i++;
> diff --git a/qom/object.c b/qom/object.c
> index 0e8267b..e5aed60 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -948,14 +948,18 @@ int object_property_get_enum(Object *obj, const char *name,
>  {
>      StringOutputVisitor *sov;
>      StringInputVisitor *siv;
> +    char *str;
>      int ret;
>
>      sov = string_output_visitor_new(false);
>      object_property_get(obj, string_output_get_visitor(sov), name, errp);
> -    siv = string_input_visitor_new(string_output_get_string(sov));
> +    str = string_output_get_string(sov);
> +    siv = string_input_visitor_new(str);
>      string_output_visitor_cleanup(sov);
>      visit_type_enum(string_input_get_visitor(siv),
>                      &ret, strings, NULL, name, errp);
> +
> +    g_free(str);
>      string_input_visitor_cleanup(siv);
>
>      return ret;
> @@ -966,13 +970,17 @@ void object_property_get_uint16List(Object *obj, const char *name,
>  {
>      StringOutputVisitor *ov;
>      StringInputVisitor *iv;
> +    char *str;
>
>      ov = string_output_visitor_new(false);
>      object_property_get(obj, string_output_get_visitor(ov),
>                          name, errp);
> -    iv = string_input_visitor_new(string_output_get_string(ov));
> +    str = string_output_get_string(ov);
> +    iv = string_input_visitor_new(str);
>      visit_type_uint16List(string_input_get_visitor(iv),
>                            list, NULL, errp);
> +
> +    g_free(str);
>      string_output_visitor_cleanup(ov);
>      string_input_visitor_cleanup(iv);
>  }
> --
> 1.9.3
>
>
diff mbox

Patch

diff --git a/hmp.c b/hmp.c
index 4d1838e..ba40c75 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1687,6 +1687,7 @@  void hmp_info_memdev(Monitor *mon, const QDict *qdict)
     MemdevList *memdev_list = qmp_query_memdev(&err);
     MemdevList *m = memdev_list;
     StringOutputVisitor *ov;
+    char *str;
     int i = 0;
 
 
@@ -1704,9 +1705,10 @@  void hmp_info_memdev(Monitor *mon, const QDict *qdict)
                        m->value->prealloc ? "true" : "false");
         monitor_printf(mon, "  policy: %s\n",
                        HostMemPolicy_lookup[m->value->policy]);
-        monitor_printf(mon, "  host nodes: %s\n",
-                       string_output_get_string(ov));
+        str = string_output_get_string(ov);
+        monitor_printf(mon, "  host nodes: %s\n", str);
 
+        g_free(str);
         string_output_visitor_cleanup(ov);
         m = m->next;
         i++;
diff --git a/qom/object.c b/qom/object.c
index 0e8267b..e5aed60 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -948,14 +948,18 @@  int object_property_get_enum(Object *obj, const char *name,
 {
     StringOutputVisitor *sov;
     StringInputVisitor *siv;
+    char *str;
     int ret;
 
     sov = string_output_visitor_new(false);
     object_property_get(obj, string_output_get_visitor(sov), name, errp);
-    siv = string_input_visitor_new(string_output_get_string(sov));
+    str = string_output_get_string(sov);
+    siv = string_input_visitor_new(str);
     string_output_visitor_cleanup(sov);
     visit_type_enum(string_input_get_visitor(siv),
                     &ret, strings, NULL, name, errp);
+
+    g_free(str);
     string_input_visitor_cleanup(siv);
 
     return ret;
@@ -966,13 +970,17 @@  void object_property_get_uint16List(Object *obj, const char *name,
 {
     StringOutputVisitor *ov;
     StringInputVisitor *iv;
+    char *str;
 
     ov = string_output_visitor_new(false);
     object_property_get(obj, string_output_get_visitor(ov),
                         name, errp);
-    iv = string_input_visitor_new(string_output_get_string(ov));
+    str = string_output_get_string(ov);
+    iv = string_input_visitor_new(str);
     visit_type_uint16List(string_input_get_visitor(iv),
                           list, NULL, errp);
+
+    g_free(str);
     string_output_visitor_cleanup(ov);
     string_input_visitor_cleanup(iv);
 }