External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

util: Remove need for STATIC_ANALYSIS check

Browse Source 
Seems recent versions of Coverity have (mostly) resolved the issue using
ternary operations in VIR_FREE (and now VIR_DISPOSE*) macros.  So let's
just remove it and if necessary handle one off issues as the arise.
This commit is contained in:
John Ferlan 2016-05-17 10:16:59 -04:00
parent c1faf3093c
commit 4a718d6a0e
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/util/viralloc.h
View File

@ -547,19 +547,11 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt
* *
* This macro is safe to use on arguments with side effects. * This macro is safe to use on arguments with side effects.
*/ */
# if !STATIC_ANALYSIS
/* The ternary ensures that ptr is a non-const pointer and not an /* The ternary ensures that ptr is a non-const pointer and not an
* integer type, all while evaluating ptr only once. This gives us * integer type, all while evaluating ptr only once. This gives us
* extra compiler safety when compiling under gcc. * extra compiler safety when compiling under gcc.
*/ */
# define VIR_FREE(ptr) virFree(1 ? (void *) &(ptr) : (ptr)) # define VIR_FREE(ptr) virFree(1 ? (void *) &(ptr) : (ptr))
# else
/* The Coverity static analyzer considers the else path of the "?:" and
* flags the VIR_FREE() of the address of the address of memory as a
* RESOURCE_LEAK resulting in numerous false positives (eg, VIR_FREE(&ptr))
*/
# define VIR_FREE(ptr) virFree(&(ptr))
# endif
/** /**
@ -572,13 +564,8 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt
* *
* This macro is safe to use on arguments with side effects. * This macro is safe to use on arguments with side effects.
*/ */
# if !STATIC_ANALYSIS
/* See explanation in VIR_FREE */
# define VIR_DISPOSE_N(ptr, count) virDispose(1 ? (void *) &(ptr) : (ptr), 0, \ # define VIR_DISPOSE_N(ptr, count) virDispose(1 ? (void *) &(ptr) : (ptr), 0, \
sizeof(*(ptr)), &(count)) sizeof(*(ptr)), &(count))
# else
# define VIR_DISPOSE_N(ptr, count) virDispose(&(ptr), 0, sizeof(*(ptr)), &(count))
# endif
/** /**
@ -589,13 +576,8 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt
* *
* This macro is not safe to be used on arguments with side effects. * This macro is not safe to be used on arguments with side effects.
*/ */
# if !STATIC_ANALYSIS
/* See explanation in VIR_FREE */
# define VIR_DISPOSE_STRING(ptr) virDispose(1 ? (void *) &(ptr) : (ptr), \ # define VIR_DISPOSE_STRING(ptr) virDispose(1 ? (void *) &(ptr) : (ptr), \
(ptr) ? strlen((ptr)) : 0, 1, NULL) (ptr) ? strlen((ptr)) : 0, 1, NULL)
# else
# define VIR_DISPOSE_STRING(ptr) virDispose(&(ptr), (ptr) ? strlen((ptr)) : 1, NULL)
# endif
/** /**
@ -606,12 +588,8 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt
* *
* This macro is safe to be used on arguments with side effects. * This macro is safe to be used on arguments with side effects.
*/ */
# if !STATIC_ANALYSIS # define VIR_DISPOSE(ptr) virDispose(1 ? (void *) &(ptr) : (ptr), 1, \
/* See explanation in VIR_FREE */ sizeof(*(ptr)), NULL)
# define VIR_DISPOSE(ptr) virDispose(1 ? (void *) &(ptr) : (ptr), 1, sizeof(*(ptr)), NULL)
# else
# define VIR_DISPOSE(ptr) virDispose(&(ptr), 1, sizeof(*(ptr)), NULL)
# endif
void virAllocTestInit(void); void virAllocTestInit(void);