diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-07 15:51:31 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-07 15:51:31 (GMT) |
| commit | ef9d3ff8dd3f28d259c97f701cda2e652ee9c89d (patch) | |
| tree | 68894170402e60b5a1c578bf34c1fd6ccc830442 /src/corelib/arch/symbian/debugfunction.cpp | |
| parent | ba7bec67c4ff68efa0abf3e204c39324fd6caf55 (diff) | |
| parent | 93b40aa12270714abe722bbc4e47166f5a47bdf4 (diff) | |
| download | Qt-ef9d3ff8dd3f28d259c97f701cda2e652ee9c89d.zip Qt-ef9d3ff8dd3f28d259c97f701cda2e652ee9c89d.tar.gz Qt-ef9d3ff8dd3f28d259c97f701cda2e652ee9c89d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/corelib/arch/symbian/debugfunction.cpp')
| -rw-r--r-- | src/corelib/arch/symbian/debugfunction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/arch/symbian/debugfunction.cpp b/src/corelib/arch/symbian/debugfunction.cpp index f3b5d2d..31937e8 100644 --- a/src/corelib/arch/symbian/debugfunction.cpp +++ b/src/corelib/arch/symbian/debugfunction.cpp @@ -549,7 +549,7 @@ void ResetAllocCellLevels(TAny* aPtr, RHybridHeap::TCellType aType, TAny* aCell, if (aType == RHybridHeap::EGoodAllocatedCell) { - RHybridHeap::SDebugCell* DbgCell = (RHybridHeap::SDebugCell*)((TUint8*)aCell-RHeap::EDebugHdrSize); + RHybridHeap::SDebugCell* DbgCell = (RHybridHeap::SDebugCell*)((TUint8*)aCell-RHybridHeap::EDebugHdrSize); DbgCell->nestingLevel = 0; } } @@ -1105,7 +1105,7 @@ void RHybridHeap::DoCheckSlab(slab* aSlab, TAllocatorType aSlabType, TAny* aBfr) unsigned used = SlabHeaderUsedm4(h)+4; unsigned size = SlabHeaderSize(h); __HEAP_CORRUPTED_TEST( (used < SLABSIZE),ETHeapBadCellAddress, aBfr, aSlab); - __HEAP_CORRUPTED_TEST( ((size > 3 ) && (size < MAXSLABSIZE)), ETHeapBadCellAddress,aBfr,aSlab); + __HEAP_CORRUPTED_TEST( ((size > 3 ) && (size <= MAXSLABSIZE)), ETHeapBadCellAddress,aBfr,aSlab); unsigned count = 0; switch ( aSlabType ) |