diff options
Diffstat (limited to 'store')
| -rw-r--r-- | store/source/stordata.cxx | 6 | ||||
| -rw-r--r-- | store/source/stordir.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/store/source/stordata.cxx b/store/source/stordata.cxx index 7ce39a9c1208..7e989bc43352 100644 --- a/store/source/stordata.cxx +++ b/store/source/stordata.cxx @@ -244,7 +244,7 @@ storeError OStoreIndirectionPageObject::read ( // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); - if (!((nDouble < nLimit) && (nSingle < nLimit))) + if ((nDouble >= nLimit) || (nSingle >= nLimit)) return store_E_InvalidAccess; // Check single indirect page location. @@ -347,7 +347,7 @@ storeError OStoreIndirectionPageObject::write ( // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); - if (!((nDouble < nLimit) && (nSingle < nLimit))) + if ((nDouble >= nLimit) || (nSingle >= nLimit)) return store_E_InvalidAccess; // Load or create single indirect page. @@ -462,7 +462,7 @@ storeError OStoreIndirectionPageObject::truncate ( // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); - if (!((nDouble < nLimit) && (nSingle < nLimit))) + if ((nDouble >= nLimit) || (nSingle >= nLimit)) return store_E_InvalidAccess; // Truncate. diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx index 7688194069de..80cb2efc501c 100644 --- a/store/source/stordir.cxx +++ b/store/source/stordir.cxx @@ -165,7 +165,7 @@ storeError OStoreDirectory_Impl::iterate (storeFindData &rFindData) { OStorePageLink aLink; eErrCode = m_xManager->iterate (aKey, aLink, rFindData.m_nAttrib); - if (!((eErrCode == store_E_None) && (aKey.m_nHigh == store::htonl(m_nPath)))) + if (eErrCode != store_E_None || aKey.m_nHigh != store::htonl(m_nPath)) break; if (!(rFindData.m_nAttrib & STORE_ATTRIB_ISLINK)) |