shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

For 0.4.3, danpb's new memory management scheme went into libvirt. This is

Browse Source 
fine, except that is subtly alters the semantics of malloc(), calloc(), and
realloc().  In particular, if you say:

foo = malloc(0);

glibc will happily return a non-NULL pointer to you.  However, with the new
memory management stuff, if you say:

foo = VIR_ALLOC(0);

you will actually get a NULL pointer back.  Personally, I think this is a
dangerous deviation from malloc() semantics that everyone is used to, and is
indeed causing problems with the remote driver.  The short of it is that the
remote driver allocates memory on behalf of the remote side using VIR_ALLOC_N,
and this call is returning NULL so that the NULL checks elsewhere in the code
fire and return failure.

The attached patch fixes this situation by removing the 0 checks from the memory
allocation paths, and just lets them fall through to the normal malloc(),
calloc(), or realloc() routines, restoring old semantics.

Signed-off-by: Chris Lalancette <clalance@redhat.com>
This commit is contained in:
Chris Lalancette 2008-06-19 11:58:49 +00:00
parent a24b1d9eda
commit 0aa6eedddd
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/memory.c
View File

@ -97,11 +97,6 @@ int __virAlloc(void *ptrptr, size_t size)
} }
#endif #endif
if (size == 0) {
*(void **)ptrptr = NULL;
return 0;
}
*(void **)ptrptr = calloc(1, size); *(void **)ptrptr = calloc(1, size);
if (*(void **)ptrptr == NULL) if (*(void **)ptrptr == NULL)
return -1; return -1;
@ -130,11 +125,6 @@ int __virAllocN(void *ptrptr, size_t size, size_t count)
} }
#endif #endif
if (size == 0 || count == 0) {
*(void **)ptrptr = NULL;
return 0;
}
*(void**)ptrptr = calloc(count, size); *(void**)ptrptr = calloc(count, size);
if (*(void**)ptrptr == NULL) if (*(void**)ptrptr == NULL)
return -1; return -1;
@ -163,11 +153,6 @@ int __virReallocN(void *ptrptr, size_t size, size_t count)
return -1; return -1;
#endif #endif
if (size == 0 || count == 0) {
free(*(void **)ptrptr);
*(void **)ptrptr = NULL;
return 0;
}
if (xalloc_oversized(count, size)) { if (xalloc_oversized(count, size)) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;