[Libreoffice-commits] core.git: cppu/source pyuno/source vcl/unx

[Libreoffice Gerrit user]

 cppu/source/typelib/typelib.cxx           |    7 +++++++
 pyuno/source/module/pyuno_dlopenwrapper.c |    1 +
 vcl/unx/generic/plugadapt/salplug.cxx     |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 1d457f960b3bb8efe8132b87babba7db4b58813e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 26 11:23:13 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 26 22:04:32 2018 +0200

    Related: rhbz#1602589 silence coverity leaked_storage
    
    Change-Id: Iae694be40b32cc3821d326bb362e6091dba19a35
    Reviewed-on: https://gerrit.libreoffice.org/58079
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index c586ae2220ea..46238d5481b0 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -555,6 +555,7 @@ extern "C" void typelib_typedescription_newEmpty(
             osl_atomic_increment( &Init::get().nIndirectTypeDescriptionCount );
 #endif
             pTmp->pType = nullptr;
+            // coverity[leaked_storage] - this is on purpose
         }
         break;
 
@@ -572,6 +573,7 @@ extern "C" void typelib_typedescription_newEmpty(
             pTmp->aBase.ppTypeRefs = nullptr;
             pTmp->aBase.ppMemberNames = nullptr;
             pTmp->pParameterizedTypes = nullptr;
+            // coverity[leaked_storage] - this is on purpose
         }
         break;
 
@@ -588,6 +590,7 @@ extern "C" void typelib_typedescription_newEmpty(
             pTmp->pMemberOffsets = nullptr;
             pTmp->ppTypeRefs = nullptr;
             pTmp->ppMemberNames = nullptr;
+            // coverity[leaked_storage] - this is on purpose
         }
         break;
 
@@ -602,6 +605,7 @@ extern "C" void typelib_typedescription_newEmpty(
             pTmp->nEnumValues       = 0;
             pTmp->ppEnumNames       = nullptr;
             pTmp->pEnumValues       = nullptr;
+            // coverity[leaked_storage] - this is on purpose
         }
         break;
 
@@ -623,6 +627,7 @@ extern "C" void typelib_typedescription_newEmpty(
             pTmp->pMapMemberIndexToFunctionIndex= nullptr;
             pTmp->nBaseTypes = 0;
             pTmp->ppBaseTypes = nullptr;
+            // coverity[leaked_storage] - this is on purpose
         }
         break;
 
@@ -643,6 +648,7 @@ extern "C" void typelib_typedescription_newEmpty(
             pTmp->pInterface = nullptr;
             pTmp->pBaseRef = nullptr;
             pTmp->nIndex = 0;
+            // coverity[leaked_storage] - this is on purpose
         }
         break;
 
@@ -663,6 +669,7 @@ extern "C" void typelib_typedescription_newEmpty(
             pTmp->ppGetExceptions = nullptr;
             pTmp->nSetExceptions = 0;
             pTmp->ppSetExceptions = nullptr;
+            // coverity[leaked_storage] - this is on purpose
         }
         break;
 
diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c b/pyuno/source/module/pyuno_dlopenwrapper.c
index 5654cb0f8f0a..44e711653e35 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -72,6 +72,7 @@ static void * load(void const * address, char const * symbol) {
         dlclose(h);
         abort();
     }
+    // coverity[leaked_storage] - this is on purpose
     return func;
 }
 
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 41039c0584f8..d3939b986b41 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -123,6 +123,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
         SAL_INFO("vcl.plugadapt", "could not load shared object " << aModule);
     }
 
+    // coverity[leaked_storage] - this is on purpose
     return pInst;
 }
 
@@ -317,4 +318,4 @@ SalData::~SalData() COVERITY_NOEXCEPT_FALSE
     psp::PrinterInfoManager::release();
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */