From 51f6e634fdd3b58ef0586e5f2b754b7fbba6b52c Mon Sep 17 00:00:00 2001 From: Pasi Pentikainen Date: Mon, 7 May 2012 18:54:55 +0300 Subject: Symbian: fix AlignedBlockAllocator initialization on emulator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correction to assert in AlignedBlockAllocator contructor. It had a typo, leading to assert against uninitialized data, which succeeded in all other environments, except in emulator urel version (which zeroes heap allocations). Task-number: ou1cimx1#998546 Change-Id: I9b8a76f1871287263483cfe09b1e962570f9990d Reviewed-by: Pauli Järvinen Reviewed-by: Murray Read Reviewed-by: Pasi Pentikäinen --- .../javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp index f09bf8e..7ed8b96 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp @@ -44,7 +44,7 @@ AlignedBlockAllocator::AlignedBlockAllocator(TUint32 reservationSize, TUint32 bl m_blockSize(blockSize) { TInt err = m_lock.CreateLocal(); - __ASSERT_ALWAYS(m_map.bits, User::Panic(_L("AlignedBlkAlloc0"), err)); + __ASSERT_ALWAYS(err == KErrNone, User::Panic(_L("AlignedBlkAlloc0"), err)); // Get system's page size value. SYMBIAN_PAGESIZE(m_pageSize); -- cgit v0.12