diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-10 10:44:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-10 12:50:20 +0100 |
| commit | 51f7c69f4f07a00363c84097744f1a2bbcdc309a (patch) | |
| tree | 56c36029f0fc852cbb98dbe1d275f535532b0305 | |
| parent | cbdf857299ebff0bcf2d10bf877bc74c2167a4e8 (diff) | |
coverity#1240260 Operands don't affect result
see can we silence these false positives
coverity#1240259 Operands don't affect result
coverity#1240254 Operands don't affect result
coverity#1240264 Operands don't affect result
coverity#1240267 Operands don't affect result
Change-Id: Ieca40474c231e33a516b70f7693346ac73babd61
| -rw-r--r-- | sal/osl/unx/file.cxx | 6 | ||||
| -rw-r--r-- | tools/source/generic/config.cxx | 2 | ||||
| -rw-r--r-- | writerperfect/source/common/WPXSvInputStream.cxx | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index a7eaac15e1f8..0e0e388b41fb 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -1110,8 +1110,7 @@ SAL_CALL osl_mapFile ( return osl_File_E_INVAL; *ppAddr = 0; - static sal_uInt64 const g_limit_size_t = std::numeric_limits< size_t >::max(); - if (g_limit_size_t < uLength) + if (uLength > SAL_MAX_SIZE) return osl_File_E_OVERFLOW; size_t const nLength = sal::static_int_cast< size_t >(uLength); @@ -1190,8 +1189,7 @@ unmapFile (void* pAddr, sal_uInt64 uLength) if (0 == pAddr) return osl_File_E_INVAL; - static sal_uInt64 const g_limit_size_t = std::numeric_limits< size_t >::max(); - if (g_limit_size_t < uLength) + if (uLength > SAL_MAX_SIZE) return osl_File_E_OVERFLOW; size_t const nLength = sal::static_int_cast< size_t >(uLength); diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 913a1cfe3cb6..fdc73360d3dc 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -104,7 +104,7 @@ static sal_uInt8* ImplSysReadConfig( const OUString& rFileName, sal_uInt64 nPos = 0; if( aFile.getSize( nPos ) == ::osl::FileBase::E_None ) { - if (nPos > std::numeric_limits< std::size_t >::max()) { + if (nPos > SAL_MAX_SIZE) { aFile.close(); return 0; } diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index 1f8d57543186..3c22f9d3b341 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -504,7 +504,7 @@ long WPXSvInputStreamImpl::tell() else { sal_Int64 tmpPosition = mxSeekable->getPosition(); - if ((tmpPosition < 0) || (tmpPosition > (std::numeric_limits<long>::max)())) + if ((tmpPosition < 0) || (tmpPosition > LONG_MAX)) return -1L; return (long)tmpPosition; } @@ -516,7 +516,7 @@ int WPXSvInputStreamImpl::seek(long offset) return -1; sal_Int64 tmpPosition = mxSeekable->getPosition(); - if ((tmpPosition < 0) || (tmpPosition > (std::numeric_limits<long>::max)())) + if ((tmpPosition < 0) || (tmpPosition > LONG_MAX)) return -1; try |