[Libreoffice-commits] core.git: 3 commits - filter/source soltools/cpp

[Caolán McNamara (via logerrit)]

 filter/source/flash/swfwriter1.cxx |    4 ++--
 filter/source/svg/svgwriter.cxx    |    3 ++-
 soltools/cpp/_macro.c              |    1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a15729a63ea90a066a6a98a762f4a1c2b19f9389
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 17 19:12:44 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 18 10:02:15 2019 +0100

    cid#1430070 Copy-paste error
    
    add annotation
    
    Change-Id: I6973335b8877b48d5cf0a08f4e291585de352446
    Reviewed-on: https://gerrit.libreoffice.org/83035
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 9253bbace5f3..ca4a2368bd9d 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2428,7 +2428,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
             if ( aTextColor == COL_BLACK )
                 aTextColor = COL_WHITE;
 
-            if ( aTextColor == COL_WHITE )
+            // coverity[copy_paste_error : FALSE] - aReliefColor depending on aTextColor is correct
+            if (aTextColor == COL_WHITE)
                 aReliefColor = COL_BLACK;
 
 
commit 24a8e873bba179cf50b2157e95a97d089e379e1c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 17 19:14:07 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 18 10:01:57 2019 +0100

    cid#1430063 Copy-paste error
    
    add annotation
    
    Change-Id: I162b4f388baff243425d34a13c1104dfdaf92588
    Reviewed-on: https://gerrit.libreoffice.org/83036
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 5416ab869442..4bc117c0dccf 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -402,10 +402,10 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
             if ( aTextColor == COL_BLACK )
                 aTextColor = COL_WHITE;
 
-            if ( aTextColor == COL_WHITE )
+            // coverity[copy_paste_error : FALSE] - aReliefColor depending on aTextColor is correct
+            if (aTextColor == COL_WHITE)
                 aReliefColor = COL_BLACK;
 
-
             Point aPos( rPos );
             Point aOffset( 6,6 );
 
commit de38c4a5ea015f0f881b80f7ec0dcbaf323bc1e0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 17 17:54:20 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 18 10:01:42 2019 +0100

    cid#1448469 Out-of-bounds access
    
    add an annotation
    
    Change-Id: I70a431fecd8a87f2167bdce53ec2397d22436a9d
    Reviewed-on: https://gerrit.libreoffice.org/83025
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index eaafb86034ef..ef41b992edae 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -411,6 +411,7 @@ int
         ntok++;
         if (trp->tp >= trp->lp)
         {
+            // coverity[overrun-buffer-arg: FALSE] - a multiple of trp->max is allocated, not trp->max itself
             gettokens(trp, 0);
             if ((trp->lp - 1)->type == END)
             {