[Libreoffice-commits] core.git: 2 commits - odk/source vcl/source

[Caolán McNamara (via logerrit)]

 odk/source/unoapploader/unx/unoapploader.c |    1 +
 odk/source/unoapploader/win/unoapploader.c |    1 +
 vcl/source/outdev/text.cxx                 |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit eddf039a85a30f4196cb21b9b4cb24ee82c72722
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 17 18:02:13 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Nov 17 20:46:44 2019 +0100

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

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 3c69069929a8..26d7e38f318c 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -338,6 +338,7 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout )
 
         // relief-color is black for white text, in all other cases
         // we set this to LightGray
+        // coverity[copy_paste_error: FALSE] - this is intentional
         if ( aTextColor == COL_WHITE )
             aReliefColor = COL_BLACK;
         SetTextLineColor( aReliefColor );
commit 10be6512107891b5bd4f1055fac3dcd9fe3b784c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 17 17:34:13 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Nov 17 20:46:33 2019 +0100

    cid#706181 Use of untrusted string value
    
    use an annotation here and add one to the windows equivalent
    
    Change-Id: Ife54949c2e89ae606d7931be82807db4bbb132dc
    Reviewed-on: https://gerrit.libreoffice.org/83024
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index f0e33f817021..3a35599292be 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -200,6 +200,7 @@ int main( int argc, char *argv[] )
             strcat( envstr, PATHSEPARATOR );
             strcat( envstr, value );
         }
+        /* coverity[tainted_data : FALSE] */
         putenv( envstr );
     }
     else
diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index 455f4689adad..4baa3ddda8c5 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -218,6 +218,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
             wcscat( envstr, PATHSEPARATOR );
             wcscat( envstr, value );
         }
+        /* coverity[tainted_data : FALSE] */
         _wputenv( envstr );
         free( envstr );
         free( path );