External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-20 13:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reporting of errors in OOM injection code

Browse Source 
When the various viralloc.c functions were changed to use the
normal error reporting code, the OOM injection code paths
were not updated to report errors.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-09-23 14:19:25 +01:00
parent 5dd3b5e32a
commit ecd2ba6893
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/viralloc.c
View File

@ -132,6 +132,9 @@ int virAlloc(void *ptrptr,
#if TEST_OOM
if (virAllocTestFail()) {
*(void **)ptrptr = NULL;
if (report)
virReportOOMErrorFull(domcode, filename, funcname, linenr);
errno = ENOMEM;
return -1;
}
#endif
@ -176,6 +179,9 @@ int virAllocN(void *ptrptr,
#if TEST_OOM
if (virAllocTestFail()) {
*(void **)ptrptr = NULL;
if (report)
virReportOOMErrorFull(domcode, filename, funcname, linenr);
errno = ENOMEM;
return -1;
}
#endif
@ -220,8 +226,12 @@ int virReallocN(void *ptrptr,
{
void *tmp;
#if TEST_OOM
if (virAllocTestFail())
if (virAllocTestFail()) {
if (report)
virReportOOMErrorFull(domcode, filename, funcname, linenr);
errno = ENOMEM;
return -1;
}
#endif
if (xalloc_oversized(count, size)) {
@ -529,8 +539,12 @@ int virAllocVar(void *ptrptr,
size_t alloc_size = 0;
#if TEST_OOM
if (virAllocTestFail())
if (virAllocTestFail()) {
if (report)
virReportOOMErrorFull(domcode, filename, funcname, linenr);
errno = ENOMEM;
return -1;
}
#endif
if (VIR_ALLOC_VAR_OVERSIZED(struct_size, count, element_size)) {