[Libreoffice-commits] core.git: cppu/source include/com

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 25 13:16:49 UTC 2020


 cppu/source/uno/sequence.cxx          |    3 +--
 include/com/sun/star/uno/Sequence.hxx |    9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 92906c11610f3f4c07ed730f6538d92c78533cd4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 25 12:19:51 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 25 15:16:06 2020 +0200

    cid#1448292 coverity has difficulty with css::uno::Sequence
    
    current attempt isn't working, try a different approach to
    silence these warnings
    
    Change-Id: I0cc97df0897abc665dfbb683d7aa0df55f8affb2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103387
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 72d3e3ead42b..c467f2c38704 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -307,7 +307,7 @@ static bool idefaultConstructElements(
     return true;
 }
 
-
+// coverity[ -tainted_data_sink : arg-1 ]
 static bool icopyConstructFromElements(
     uno_Sequence ** ppSeq, void * pSourceElements,
     typelib_TypeDescriptionReference * pElementType,
@@ -652,7 +652,6 @@ static bool ireallocSequence(
 extern "C"
 {
 
-
 sal_Bool SAL_CALL uno_type_sequence_construct(
     uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType,
     void * pElements, sal_Int32 len,
diff --git a/include/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx
index 3d0c024a1da3..af82925d5f1b 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -73,20 +73,11 @@ inline Sequence< E >::Sequence(
 {
 }
 
-#if defined(__COVERITY__)
-extern "C" void __coverity_tainted_data_sanitize__(void *);
-#endif
-
 template< class E >
 inline Sequence< E >::Sequence( const E * pElements, sal_Int32 len )
 {
     const Type & rType = ::cppu::getTypeFavourUnsigned( this );
 
-#if defined(__COVERITY__)
-    // cid#1448292 coverity has difficulty with css::uno::Sequence
-    __coverity_tainted_data_sanitize__(const_cast<E*>(pElements));
-#endif
-
     bool success =
     ::uno_type_sequence_construct(
         &_pSequence, rType.getTypeLibType(),


More information about the Libreoffice-commits mailing list