ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

WaE: C6011 Dereferencing NULL pointer warnings from unchecked malloc

Browse Source 
Change-Id: I14892e3d0badb4a46b82624b86d78eb9bcb8eed7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166700
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2024-04-30 11:08:26 +02:00
parent 26166ad838
commit 1a471e674f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup_native/source/win32/customactions/regactivex/regactivex.cxx
+3 -2
View File
@@ -67,7 +67,7 @@ static void RegisterActiveXNative( const wchar_t* pActiveXPath, int nMode, bool
if ( nLen > nRemoveLen )
{
wchar_t* pProgramPath = static_cast<wchar_t*>( malloc( (nLen - nRemoveLen + 1) * sizeof(wchar_t) ) );
assert(pProgramPath); // Don't handle OOM conditions
assert(pProgramPath && "Don't handle OOM conditions");
wcsncpy( pProgramPath, pActiveXPath, nLen - nRemoveLen );
pProgramPath[ nLen - nRemoveLen ] = 0;
@@ -104,7 +104,7 @@ static bool GetMsiPropW( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppV
sz++;
DWORD nbytes = sz * sizeof( wchar_t );
wchar_t* buff = static_cast<wchar_t*>( malloc( nbytes ) );
assert(buff); // Don't handle OOM conditions
assert(buff && "Don't handle OOM conditions");
ZeroMemory( buff, nbytes );
MsiGetPropertyW( hMSI, pPropName, buff, &sz );
*ppValue = buff;
@@ -123,6 +123,7 @@ static bool GetActiveXControlPath( MSIHANDLE hMSI, wchar_t** ppActiveXPath )
{
int nLen = wcslen( pProgPath );
*ppActiveXPath = static_cast<wchar_t*>( malloc( (nLen + 23) * sizeof(wchar_t) ) );
assert(*ppActiveXPath && "Don't handle OOM conditions");
wcsncpy( *ppActiveXPath, pProgPath, nLen );
wcsncpy( (*ppActiveXPath) + nLen, L"program\\so_activex.dll", 22 );
(*ppActiveXPath)[nLen+22] = 0;