From bb4f6eede90f866d878c6de2ebdb2a061686385c Mon Sep 17 00:00:00 2001 From: "Matthias Huetsch [mhu]" Date: Thu, 25 Nov 2010 14:18:45 +0100 Subject: #i115784# store: fix memory errors uncovered by valgrind and other tools. --- store/source/lockbyte.cxx | 3 ++- store/source/storbase.cxx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'store/source') 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) -- cgit -5-4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/test/source/sheet/xsheetfilterableex.cxx
AgeCommit message (Expand)Author
2019-08-15loplugin:sequenceloop in test..toolkitNoel Grandin
2019-05-02Use hasElements to check Sequence emptiness in [t-u]*Arkadiy Illarionov