diff options
| author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-11-25 16:04:27 +0100 |
|---|---|---|
| committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-11-25 16:04:27 +0100 |
| commit | 219fe91ce289dd7b908aa9cc69c79409ff94068c (patch) | |
| tree | a62fc4da19fb5e379b0be76a7445343fa487c9ce /store | |
| parent | ad1f7b87236606a5414f3f1003f0b7f3c04dfbd6 (diff) | |
| parent | 1bd0f73be5802157f5ccd3ba4b79ce76150d0114 (diff) | |
Update from sibling repository.
Diffstat (limited to 'store')
| -rw-r--r-- | store/source/lockbyte.cxx | 3 | ||||
| -rw-r--r-- | store/source/storbase.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index f1145a029c29..7e4ac7bcbb00 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -600,7 +600,8 @@ oslInterlockedCount SAL_CALL MappedLockBytes::release() void MappedLockBytes::allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) { OSL_PRECOND((ppPage != 0) && (pnSize != 0), "contract violation"); - *ppPage = 0, *pnSize = m_nPageSize; + if ((ppPage != 0) && (pnSize != 0)) + *ppPage = 0, *pnSize = m_nPageSize; } void MappedLockBytes::deallocate_Impl (void * pPage) diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx index 6eb005e453d8..690bff8d258e 100644 --- a/store/source/storbase.cxx +++ b/store/source/storbase.cxx @@ -158,7 +158,8 @@ PageData::Allocator_Impl::~Allocator_Impl() void PageData::Allocator_Impl::allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) { OSL_PRECOND((ppPage != 0) && (pnSize != 0), "contract violation"); - *ppPage = rtl_cache_alloc(m_page_cache), *pnSize = m_page_size; + if ((ppPage != 0) && (pnSize != 0)) + *ppPage = rtl_cache_alloc(m_page_cache), *pnSize = m_page_size; } void PageData::Allocator_Impl::deallocate_Impl (void * pPage) |