projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5168ab1
)
virt: Fix memory leak with libvirt MetadataXPath enabled
author
Pavel Rochnyack
<pavel2000@ngs.ru>
Mon, 22 Jul 2019 16:45:18 +0000
(23:45 +0700)
committer
Ryan McCabe
<rmccabe@redhat.com>
Tue, 23 Jul 2019 15:05:58 +0000
(11:05 -0400)
Issue: #3225
src/virt.c
patch
|
blob
|
history
diff --git
a/src/virt.c
b/src/virt.c
index
5c894c2
..
2028b04
100644
(file)
--- a/
src/virt.c
+++ b/
src/virt.c
@@
-816,6
+816,7
@@
metadata_end:
static void init_value_list(value_list_t *vl, virDomainPtr dom) {
const char *name;
static void init_value_list(value_list_t *vl, virDomainPtr dom) {
const char *name;
+ char *metaname;
char uuid[VIR_UUID_STRING_BUFLEN];
sstrncpy(vl->plugin, PLUGIN_NAME, sizeof(vl->plugin));
char uuid[VIR_UUID_STRING_BUFLEN];
sstrncpy(vl->plugin, PLUGIN_NAME, sizeof(vl->plugin));
@@
-846,9
+847,10
@@
static void init_value_list(value_list_t *vl, virDomainPtr dom) {
SSTRNCAT(vl->host, uuid, sizeof(vl->host));
break;
case hf_metadata:
SSTRNCAT(vl->host, uuid, sizeof(vl->host));
break;
case hf_metadata:
- name = metadata_get_hostname(dom);
- if (name)
- SSTRNCAT(vl->host, name, sizeof(vl->host));
+ metaname = metadata_get_hostname(dom);
+ if (metaname)
+ SSTRNCAT(vl->host, metaname, sizeof(vl->host));
+ sfree(metaname);
break;
}
}
break;
}
}
@@
-874,9
+876,10
@@
static void init_value_list(value_list_t *vl, virDomainPtr dom) {
SSTRNCAT(vl->plugin_instance, uuid, sizeof(vl->plugin_instance));
break;
case plginst_metadata:
SSTRNCAT(vl->plugin_instance, uuid, sizeof(vl->plugin_instance));
break;
case plginst_metadata:
- name = metadata_get_hostname(dom);
- if (name)
- SSTRNCAT(vl->plugin_instance, name, sizeof(vl->plugin_instance));
+ metaname = metadata_get_hostname(dom);
+ if (metaname)
+ SSTRNCAT(vl->plugin_instance, metaname, sizeof(vl->plugin_instance));
+ sfree(metaname);
break;
}
}
break;
}
}