Kaydet (Commit) 30bebeef authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1240258 Operands don't affect result

try and silence

coverity#1240258 Operands don't affect result
and
coverity#1240255 Operands don't affect result

Change-Id: If53ff385585567e9b46372f45420c4321811bca0
üst e263abaf
...@@ -1095,6 +1095,11 @@ SAL_CALL osl_syncFile(oslFileHandle Handle) ...@@ -1095,6 +1095,11 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
return osl_File_E_None; return osl_File_E_None;
} }
inline off_t max_off_t()
{
return std::numeric_limits< off_t >::max();
}
oslFileError oslFileError
SAL_CALL osl_mapFile ( SAL_CALL osl_mapFile (
oslFileHandle Handle, oslFileHandle Handle,
...@@ -1114,8 +1119,8 @@ SAL_CALL osl_mapFile ( ...@@ -1114,8 +1119,8 @@ SAL_CALL osl_mapFile (
return osl_File_E_OVERFLOW; return osl_File_E_OVERFLOW;
size_t const nLength = sal::static_int_cast< size_t >(uLength); size_t const nLength = sal::static_int_cast< size_t >(uLength);
static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max(); sal_uInt64 const limit_off_t = max_off_t();
if (g_limit_off_t < uOffset) if (uOffset > limit_off_t)
return osl_File_E_OVERFLOW; return osl_File_E_OVERFLOW;
if (pImpl->m_kind == FileHandle_Impl::KIND_MEM) if (pImpl->m_kind == FileHandle_Impl::KIND_MEM)
...@@ -1319,8 +1324,8 @@ SAL_CALL osl_readFileAt ( ...@@ -1319,8 +1324,8 @@ SAL_CALL osl_readFileAt (
if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE)) if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE))
return osl_File_E_SPIPE; return osl_File_E_SPIPE;
static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max(); sal_uInt64 const limit_off_t = max_off_t();
if (g_limit_off_t < uOffset) if (uOffset > limit_off_t)
return osl_File_E_OVERFLOW; return osl_File_E_OVERFLOW;
off_t const nOffset = sal::static_int_cast< off_t >(uOffset); off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
...@@ -1351,8 +1356,8 @@ SAL_CALL osl_writeFileAt ( ...@@ -1351,8 +1356,8 @@ SAL_CALL osl_writeFileAt (
if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE)) if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE))
return osl_File_E_BADF; return osl_File_E_BADF;
static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max(); sal_uInt64 const limit_off_t = max_off_t();
if (g_limit_off_t < uOffset) if (limit_off_t < uOffset)
return osl_File_E_OVERFLOW; return osl_File_E_OVERFLOW;
off_t const nOffset = sal::static_int_cast< off_t >(uOffset); off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
...@@ -1400,8 +1405,8 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse ...@@ -1400,8 +1405,8 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse
if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd))) if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)))
return osl_File_E_INVAL; return osl_File_E_INVAL;
static sal_Int64 const g_limit_off_t = std::numeric_limits< off_t >::max(); sal_Int64 const limit_off_t = max_off_t();
if (g_limit_off_t < uOffset) if (uOffset > limit_off_t)
return osl_File_E_OVERFLOW; return osl_File_E_OVERFLOW;
off_t nPos = 0, nOffset = sal::static_int_cast< off_t >(uOffset); off_t nPos = 0, nOffset = sal::static_int_cast< off_t >(uOffset);
...@@ -1417,7 +1422,7 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse ...@@ -1417,7 +1422,7 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse
nPos = sal::static_int_cast< off_t >(pImpl->getPos()); nPos = sal::static_int_cast< off_t >(pImpl->getPos());
if ((0 > nOffset) && (-1*nOffset > nPos)) if ((0 > nOffset) && (-1*nOffset > nPos))
return osl_File_E_INVAL; return osl_File_E_INVAL;
if (g_limit_off_t < (sal_Int64) nPos + nOffset) if (limit_off_t < (sal_Int64) nPos + nOffset)
return osl_File_E_OVERFLOW; return osl_File_E_OVERFLOW;
break; break;
...@@ -1425,7 +1430,7 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse ...@@ -1425,7 +1430,7 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse
nPos = sal::static_int_cast< off_t >(pImpl->getSize()); nPos = sal::static_int_cast< off_t >(pImpl->getSize());
if ((0 > nOffset) && (-1*nOffset > nPos)) if ((0 > nOffset) && (-1*nOffset > nPos))
return osl_File_E_INVAL; return osl_File_E_INVAL;
if (g_limit_off_t < (sal_Int64) nPos + nOffset) if (limit_off_t < (sal_Int64) nPos + nOffset)
return osl_File_E_OVERFLOW; return osl_File_E_OVERFLOW;
break; break;
...@@ -1459,8 +1464,8 @@ SAL_CALL osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize ) ...@@ -1459,8 +1464,8 @@ SAL_CALL osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize )
if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE)) if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE))
return osl_File_E_BADF; return osl_File_E_BADF;
static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max(); sal_uInt64 const limit_off_t = max_off_t();
if (g_limit_off_t < uSize) if (uSize > limit_off_t)
return osl_File_E_OVERFLOW; return osl_File_E_OVERFLOW;
oslFileError result = pImpl->syncFile(); oslFileError result = pImpl->syncFile();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment