提交 18b6323a 编写于 作者: S Stefan Berger

Fix valgrind complaints when using kill -SIGHUP on libvirtd

This patch fixes a couple of complaints from valgrind when tickling libvirtd with SIGHUP.

The first two files contain fixes for memory leaks. The 3rd one initializes an uninitialized variable. The 4th one is another memory leak.
上级 986c2086
...@@ -2239,6 +2239,7 @@ virNWFilterPoolObjLoad(virConnectPtr conn, ...@@ -2239,6 +2239,7 @@ virNWFilterPoolObjLoad(virConnectPtr conn,
return NULL; return NULL;
} }
VIR_FREE(pool->configFile); // for driver reload
pool->configFile = strdup(path); pool->configFile = strdup(path);
if (pool->configFile == NULL) { if (pool->configFile == NULL) {
virReportOOMError(); virReportOOMError();
......
...@@ -1403,12 +1403,14 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools, ...@@ -1403,12 +1403,14 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools,
return NULL; return NULL;
} }
VIR_FREE(pool->configFile); // for driver reload
pool->configFile = strdup(path); pool->configFile = strdup(path);
if (pool->configFile == NULL) { if (pool->configFile == NULL) {
virReportOOMError(); virReportOOMError();
virStoragePoolDefFree(def); virStoragePoolDefFree(def);
return NULL; return NULL;
} }
VIR_FREE(pool->autostartLink); // for driver reload
pool->autostartLink = strdup(autostartLink); pool->autostartLink = strdup(autostartLink);
if (pool->autostartLink == NULL) { if (pool->autostartLink == NULL) {
virReportOOMError(); virReportOOMError();
......
...@@ -1092,6 +1092,12 @@ x86MapFree(struct x86_map *map) ...@@ -1092,6 +1092,12 @@ x86MapFree(struct x86_map *map)
x86ModelFree(model); x86ModelFree(model);
} }
while (map->vendors != NULL) {
struct x86_vendor *vendor = map->vendors;
map->vendors = vendor->next;
x86VendorFree(vendor);
}
VIR_FREE(map); VIR_FREE(map);
} }
......
...@@ -941,9 +941,11 @@ virPipeReadUntilEOF(int outfd, int errfd, ...@@ -941,9 +941,11 @@ virPipeReadUntilEOF(int outfd, int errfd,
fds[0].fd = outfd; fds[0].fd = outfd;
fds[0].events = POLLIN; fds[0].events = POLLIN;
fds[0].revents = 0;
finished[0] = 0; finished[0] = 0;
fds[1].fd = errfd; fds[1].fd = errfd;
fds[1].events = POLLIN; fds[1].events = POLLIN;
fds[1].revents = 0;
finished[1] = 0; finished[1] = 0;
while(!(finished[0] && finished[1])) { while(!(finished[0] && finished[1])) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册