diff options
| author | Pasi Pentikainen <ext-pasi.a.pentikainen@nokia.com> | 2012-05-07 18:54:55 +0300 |
|---|---|---|
| committer | Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> | 2012-05-10 10:22:30 +0200 |
| commit | f52aa9ddf44913c112898f384d406525bad6dba4 (patch) | |
| tree | 2ae9fcee9e424eb88137f02fe6edfedefcdbc8ef | |
| parent | 77f5182a72fca2ac673dcb50be302d14445be668 (diff) | |
Symbian: fix AlignedBlockAllocator initialization on emulator
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 <ext-pauli.p.jarvinen@nokia.com>
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 51f6e634fdd3b58ef0586e5f2b754b7fbba6b52c)
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp index f09bf8e123..7ed8b96e8c 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); |