External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Fixed memory leaks

Browse Source
This commit is contained in:
Daniel P. Berrange 2007-07-31 14:27:12 +00:00
parent f7dd6b4d6f
commit 94711ff791
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jul 31 10:24:23 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/qemu_conf.c, src/xml.c, tests/qemuxml2argvtest.c,
tests/qemuxml2xmltest.c: Fix a couple of memory leaks
Mon Jul 30 14:40:23 EST 2007 Daniel P. Berrange <berrange@redhat.com> Mon Jul 30 14:40:23 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/qemu_conf.c: Validate requested architecture and reject * src/qemu_conf.c: Validate requested architecture and reject

6
src/qemu_conf.c
View File

@ -135,6 +135,7 @@ struct qemud_network *qemudFindNetworkByName(const struct qemud_driver *driver,
void qemudFreeVMDef(struct qemud_vm_def *def) { void qemudFreeVMDef(struct qemud_vm_def *def) {
struct qemud_vm_disk_def *disk = def->disks; struct qemud_vm_disk_def *disk = def->disks;
struct qemud_vm_net_def *net = def->nets; struct qemud_vm_net_def *net = def->nets;
struct qemud_vm_input_def *input = def->inputs;
while (disk) { while (disk) {
struct qemud_vm_disk_def *prev = disk; struct qemud_vm_disk_def *prev = disk;
@ -146,6 +147,11 @@ void qemudFreeVMDef(struct qemud_vm_def *def) {
net = net->next; net = net->next;
free(prev); free(prev);
} }
while (input) {
struct qemud_vm_input_def *prev = input;
input = input->next;
free(prev);
}
free(def); free(def);
} }

7
src/xml.c
View File

@ -70,8 +70,11 @@ virXPathString(const char *xpath, xmlXPathContextPtr ctxt) {
} }
obj = xmlXPathEval(BAD_CAST xpath, ctxt); obj = xmlXPathEval(BAD_CAST xpath, ctxt);
if ((obj == NULL) || (obj->type != XPATH_STRING) || if ((obj == NULL) || (obj->type != XPATH_STRING) ||
(obj->stringval == NULL) || (obj->stringval[0] == 0)) (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
if (obj)
xmlXPathFreeObject(obj);
return(NULL); return(NULL);
}
ret = strdup((char *) obj->stringval); ret = strdup((char *) obj->stringval);
xmlXPathFreeObject(obj); xmlXPathFreeObject(obj);
if (ret == NULL) { if (ret == NULL) {
@ -618,6 +621,8 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, virBufferPtr buf
if (str != NULL && !strcmp(str, "localtime")) { if (str != NULL && !strcmp(str, "localtime")) {
virBufferAdd(buf, "(localtime 1)", 13); virBufferAdd(buf, "(localtime 1)", 13);
} }
if (str)
free(str);
virBufferAdd(buf, "))", 2); virBufferAdd(buf, "))", 2);

3
tests/qemuxml2argvtest.c
View File

@ -22,7 +22,7 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmd) {
char **argv = NULL; char **argv = NULL;
char **tmp = NULL; char **tmp = NULL;
int ret = -1, len; int ret = -1, len;
struct qemud_vm_def *vmdef; struct qemud_vm_def *vmdef = NULL;
struct qemud_vm vm; struct qemud_vm vm;
if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0) if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0)
@ -80,6 +80,7 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmd) {
free(argv); free(argv);
} }
qemudFreeVMDef(vmdef);
return ret; return ret;
} }

4
tests/qemuxml2xmltest.c
View File

@ -19,7 +19,7 @@ static int testCompareXMLToXMLFiles(const char *xml) {
char *xmlPtr = &(xmlData[0]); char *xmlPtr = &(xmlData[0]);
char *actual = NULL; char *actual = NULL;
int ret = -1; int ret = -1;
struct qemud_vm_def *vmdef; struct qemud_vm_def *vmdef = NULL;
struct qemud_vm vm; struct qemud_vm vm;
if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0) if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0)
@ -48,7 +48,7 @@ static int testCompareXMLToXMLFiles(const char *xml) {
fail: fail:
free(actual); free(actual);
qemudFreeVMDef(vmdef);
return ret; return ret;
} }