mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
plug two leaks
* src/qemu_conf.c (qemudParseXML): Free "obj" unconditionally.
This commit is contained in:
parent
40a82f3066
commit
f011f263a1
@ -1,3 +1,8 @@
|
|||||||
|
Fri May 16 18:53:12 CEST 2008 Jim Meyering <meyering@redhat.com>
|
||||||
|
|
||||||
|
plug two leaks
|
||||||
|
* src/qemu_conf.c (qemudParseXML): Free "obj" unconditionally.
|
||||||
|
|
||||||
Fri May 16 12:50:08 EST 2008 Daniel P. Berrange <berrange@redhat.com>
|
Fri May 16 12:50:08 EST 2008 Daniel P. Berrange <berrange@redhat.com>
|
||||||
|
|
||||||
Make QEMU test cases independant of QEMU capabilities on
|
Make QEMU test cases independant of QEMU capabilities on
|
||||||
|
@ -1716,11 +1716,11 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn,
|
|||||||
(obj->stringval != NULL) && (obj->stringval[0] != 0)) {
|
(obj->stringval != NULL) && (obj->stringval[0] != 0)) {
|
||||||
strncpy(def->os.bootloader, (const char*)obj->stringval, sizeof(def->os.bootloader));
|
strncpy(def->os.bootloader, (const char*)obj->stringval, sizeof(def->os.bootloader));
|
||||||
NUL_TERMINATE(def->os.bootloader);
|
NUL_TERMINATE(def->os.bootloader);
|
||||||
xmlXPathFreeObject(obj);
|
|
||||||
|
|
||||||
/* Set a default OS type, since <type> is optional with bootloader */
|
/* Set a default OS type, since <type> is optional with bootloader */
|
||||||
strcpy(def->os.type, "xen");
|
strcpy(def->os.type, "xen");
|
||||||
}
|
}
|
||||||
|
xmlXPathFreeObject(obj);
|
||||||
|
|
||||||
/* Extract OS type info */
|
/* Extract OS type info */
|
||||||
obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1])", ctxt);
|
obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1])", ctxt);
|
||||||
@ -1733,9 +1733,9 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
strcpy(def->os.type, (const char *)obj->stringval);
|
strcpy(def->os.type, (const char *)obj->stringval);
|
||||||
xmlXPathFreeObject(obj);
|
|
||||||
obj = NULL;
|
|
||||||
}
|
}
|
||||||
|
xmlXPathFreeObject(obj);
|
||||||
|
obj = NULL;
|
||||||
|
|
||||||
if (!virCapabilitiesSupportsGuestOSType(driver->caps, def->os.type)) {
|
if (!virCapabilitiesSupportsGuestOSType(driver->caps, def->os.type)) {
|
||||||
qemudReportError(conn, NULL, NULL, VIR_ERR_OS_TYPE,
|
qemudReportError(conn, NULL, NULL, VIR_ERR_OS_TYPE,
|
||||||
|
Loading…
Reference in New Issue
Block a user