Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1411155 - Fix MOZ_DEBUG parts of mozjemalloc. r=njn

Browse Source 
--HG--
extra : rebase_source : 5a2005255ad499530f0e01b2e7577e707b1b4446
This commit is contained in:
Mike Hommey 2017-10-24 14:11:14 +09:00
parent 57cc14513b
commit a465ba783c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
memory/build/mozjemalloc.cpp
View File

@ -1185,7 +1185,7 @@ static size_t opt_dirty_max = DIRTY_MAX_DEFAULT;
static void *chunk_alloc(size_t size, size_t alignment, bool base, bool *zeroed=nullptr);
static void chunk_dealloc(void *chunk, size_t size, ChunkType chunk_type);
static void chunk_ensure_zero(void* ptr, size_t size, bool zeroed);
static void chunk_ensure_zero(void* aPtr, size_t aSize, bool aZeroed);
static arena_t *arenas_extend();
static void *huge_malloc(size_t size, bool zero);
static void* huge_palloc(size_t aSize, size_t aAlignment, bool aZero);
@ -2090,18 +2090,20 @@ RETURN:
}
static void
chunk_ensure_zero(void* ptr, size_t size, bool zeroed)
chunk_ensure_zero(void* aPtr, size_t aSize, bool aZeroed)
{
if (zeroed == false)
memset(ptr, 0, size);
if (aZeroed == false) {
memset(aPtr, 0, aSize);
}
#ifdef MOZ_DEBUG
else {
size_t i;
size_t *p = (size_t *)(uintptr_t)ret;
size_t* p = (size_t*)(uintptr_t)aPtr;
for (i = 0; i < size / sizeof(size_t); i++)
for (i = 0; i < aSize / sizeof(size_t); i++) {
MOZ_ASSERT(p[i] == 0);
}
}
#endif
}