* src/xend_internal.c: fix an allocation problem in xenDaemonDomainLookupByName_ids

Daniel
This commit is contained in:
Daniel Veillard 2009-03-10 11:13:32 +00:00
parent 4dfb7e8b2e
commit 27a63a76af
2 changed files with 14 additions and 1 deletions

View File

@ -1,3 +1,8 @@
Tue Mar 10 12:03:37 CET 2009 Daniel Veillard <veilard@redhat.com>
* src/xend_internal.c: fix an allocation problem in
xenDaemonDomainLookupByName_ids
Tue Mar 10 10:29:46 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
* src/xend_internal.c: Fix tap vs vbd type for block detach

View File

@ -904,7 +904,15 @@ xenDaemonListDomainsOld(virConnectPtr xend)
count++;
}
if (VIR_ALLOC_N(ptr, count + 1 + extra) < 0)
/*
* We can'tuse the normal allocation routines as we are mixing
* an array of char * at the beginning followed by an array of char
* ret points to the NULL terminated array of char *
* ptr points to the current string after that array but in the same
* allocated block
*/
if (virAlloc((void *)&ptr,
(count + 1) * sizeof(char *) + extra * sizeof(char)) < 0)
goto error;
ret = (char **) ptr;