Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COM: Test rather than assert

Browse Source 
We generally don't care when our functions are called with invalid
arguments (validation should be performed on arguments input, not every
use). However, we do use asserts to validate arguments in Debug builds.
Unfortunately, this makes Code Analysis unhappy in the Release builds.
Let's make an exception on this one, since the check is not expensive
compared to the rest of the function.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2024-11-19 10:44:14 +01:00
parent e553485d33
commit f85047dab9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/WinStd/COM.h
View File

@ -1472,12 +1472,14 @@ namespace winstd
///
inline VARIANT BuildVBARRAY(_In_ VARTYPE vt, _In_opt_ LPCVOID array, _In_ ULONG columns, _In_ ULONG rows)
{
const size_t n = columns * rows;
if (!array && n)
throw std::invalid_argument("array is NULL");
LPSAFEARRAY sa;
size_t n;
if (columns == 1) {
// Make vector when one column only.
sa = SafeArrayCreateVector(VT_VARIANT, 0, rows);
n = rows;
}
else {
// Make 2-dimensional array when more columns.
@ -1486,11 +1488,9 @@ namespace winstd
{ rows, 0 }
};
sa = SafeArrayCreate(VT_VARIANT, 2, dim);
n = columns * rows;
}
if (!sa)
throw std::bad_alloc();
assert(array || !n);
// Support VARIANT types that may be used for SAFEARRAY
// Source: https://learn.microsoft.com/en-us/windows/win32/api/wtypes/ne-wtypes-varenum#remarks
@ -1557,7 +1557,8 @@ namespace winstd
template <class T, ULONG columns = 1>
VARIANT BuildVBARRAY(_In_reads_opt_(rows) const T* array, _In_ ULONG rows)
{
assert(array || !rows);
if (!array && rows)
throw std::invalid_argument("array is NULL");
LPSAFEARRAY sa;
if constexpr (columns == 1) {