openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

esx: Fix dynamic deep copy 

The static deep copy allocates storage for the copy. The dynamic
version injected the dynamic dispatch after the allocation. This
triggered the invalid argument check in the dynamically dispatched
deep copy call. The deep copy function expects its dest parameter
to be a pointer to a NULL-pointer. This expectation wasn't met due
to the dispatching deep copy doing the allocation before the call.

Fix this by dynamically dispatching to the correct type before the
allocation.
This commit is contained in:
Matthias Bolte 2012-08-04 19:56:17 +02:00
parent b9dfbf5723
commit c10cc25470
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/esx/esx_vi_types.c
View File

@ -621,11 +621,36 @@
#define ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(__type, _dispatch, _deep_copy) \
ESX_VI__TEMPLATE__DEEP_COPY(__type, \
ESX_VI__TEMPLATE__DISPATCH(src->_type, \
esxVI_Type_ToString(src->_type), \
__type, _dispatch, -1) \
_deep_copy)
int \
esxVI_##__type##_DeepCopy(esxVI_##__type **dest, esxVI_##__type *src) \
{ \
if (dest == NULL || *dest != NULL) { \
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \
_("Invalid argument")); \
return -1; \
} \
\
if (src == NULL) { \
return 0; \
} \
\
ESX_VI__TEMPLATE__DISPATCH(src->_type, \
esxVI_Type_ToString(src->_type), \
__type, _dispatch, -1) \
\
if (esxVI_##__type##_Alloc(dest) < 0) { \
goto failure; \
} \
\
_deep_copy \
\
return 0; \
\
failure: \
esxVI_##__type##_Free(dest); \
\
return -1; \
}