mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
Avoid segfault upon malloc failure, and plug a leak.
* src/test.c (testDomainSave): Detect testDomainDumpXML failure. Free "xml".
This commit is contained in:
parent
5561e9125f
commit
218f866f86
@ -1,5 +1,9 @@
|
|||||||
Wed Jan 30 20:49:34 CET 2008 Jim Meyering <meyering@redhat.com>
|
Wed Jan 30 20:49:34 CET 2008 Jim Meyering <meyering@redhat.com>
|
||||||
|
|
||||||
|
Avoid segfault upon malloc failure, and plug a leak.
|
||||||
|
* src/test.c (testDomainSave): Detect testDomainDumpXML failure.
|
||||||
|
Free "xml".
|
||||||
|
|
||||||
Plug test-related leaks.
|
Plug test-related leaks.
|
||||||
* src/test.c (testLoadNetwork): Free forwardDev.
|
* src/test.c (testLoadNetwork): Free forwardDev.
|
||||||
(testLoadDomain): Free ctxt.
|
(testLoadDomain): Free ctxt.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* test.c: A "mock" hypervisor for use by application unit tests
|
* test.c: A "mock" hypervisor for use by application unit tests
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006-2007 Red Hat, Inc.
|
* Copyright (C) 2006-2008 Red Hat, Inc.
|
||||||
* Copyright (C) 2006 Daniel P. Berrange
|
* Copyright (C) 2006 Daniel P. Berrange
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
@ -1281,6 +1281,11 @@ static int testDomainSave(virDomainPtr domain,
|
|||||||
GET_DOMAIN(domain, -1);
|
GET_DOMAIN(domain, -1);
|
||||||
|
|
||||||
xml = testDomainDumpXML(domain, 0);
|
xml = testDomainDumpXML(domain, 0);
|
||||||
|
if (xml == NULL) {
|
||||||
|
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR,
|
||||||
|
"cannot allocate space for metadata");
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
|
||||||
if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) {
|
if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) {
|
||||||
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR,
|
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR,
|
||||||
@ -1303,9 +1308,11 @@ static int testDomainSave(virDomainPtr domain,
|
|||||||
if (write(fd, xml, len) != len) {
|
if (write(fd, xml, len) != len) {
|
||||||
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR,
|
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR,
|
||||||
"cannot write metadata");
|
"cannot write metadata");
|
||||||
|
free(xml);
|
||||||
close(fd);
|
close(fd);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
free(xml);
|
||||||
if (close(fd) < 0) {
|
if (close(fd) < 0) {
|
||||||
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR,
|
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR,
|
||||||
"cannot save domain data");
|
"cannot save domain data");
|
||||||
|
Loading…
Reference in New Issue
Block a user