[Libreoffice-commits] core.git: 2 commits - package/source sdext/source

[Libreoffice Gerrit user]

 package/source/zipapi/CRC32.cxx                |    2 +-
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2449bf48c4cefeda4ac0ccc65c6187ae0f079f82
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Mar 2 21:22:35 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Mar 3 11:03:06 2019 +0100

    Remove redundant bitwise and when converting from sal_uInt32 to sal_Int32
    
    ...which has no effect on the result, but silences benign Clang
    -fsanitize=implicit-signed-integer-truncation warnings
    
    Change-Id: I0953914a35f2a8c4caa6f75d4918e3b3366d07e8
    Reviewed-on: https://gerrit.libreoffice.org/68628
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx
index a38d7562cf17..9413a27cefd8 100644
--- a/package/source/zipapi/CRC32.cxx
+++ b/package/source/zipapi/CRC32.cxx
@@ -41,7 +41,7 @@ void CRC32::reset()
 }
 sal_Int32 CRC32::getValue()
 {
-    return nCRC & 0xFFFFFFFFL;
+    return nCRC;
 }
 /** Update CRC32 with specified sequence of bytes
  */
commit e1ec5eb6dc76d3fcb4e29dc214daf8ee7ca9e547
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Mar 2 21:19:24 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Mar 3 11:02:56 2019 +0100

    Extend cast to whole expression
    
    ...which has no effect on the result, but silences benign Clang
    -fsanitize=implicit-signed-integer-truncation warnings
    
    Change-Id: Ic2cf38466f12462d67ceb6268d5197e13cc6143a
    Reviewed-on: https://gerrit.libreoffice.org/68627
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 919e0964b8d4..92cb45ab5a12 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -312,11 +312,11 @@ OString PDFString::getFilteredString() const
         {
             sal_Char rResult = 0;
             if( *pRun >= '0' && *pRun <= '9' )
-                rResult = sal_Char( *pRun-'0' ) << 4;
+                rResult = sal_Char( ( *pRun-'0' ) << 4 );
             else if( *pRun >= 'a' && *pRun <= 'f' )
-                rResult = sal_Char( *pRun-'a' + 10 ) << 4;
+                rResult = sal_Char( ( *pRun-'a' + 10 ) << 4 );
             else if( *pRun >= 'A' && *pRun <= 'F' )
-                rResult = sal_Char( *pRun-'A' + 10 ) << 4;
+                rResult = sal_Char( ( *pRun-'A' + 10 ) << 4 );
             pRun++;
             if( *pRun != '>' && pRun - pStr < nLen )
             {