i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VMAnonymousCache::_MergeSwapPages(): Missing check which could lead to a NULL

Browse Source 
pointer access. Should fix #5453.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35575 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-02-22 19:03:34 +00:00
parent c8a0f6587d
commit 0497cb9f12
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/VMAnonymousCache.cpp
+8 -3
View File
@@ -933,6 +933,7 @@ VMAnonymousCache::_MergePagesSmallerSource(VMAnonymousCache* source)
(off_t)page->cache_offset << PAGE_SHIFT);
if (consumerPage == NULL) {
// the page is not yet in the consumer cache - move it upwards
ASSERT_PRINT(!page->busy, "page: %p", page);
source->RemovePage(page);
InsertPage(page, (off_t)page->cache_offset << PAGE_SHIFT);
}
@@ -954,6 +955,7 @@ VMAnonymousCache::_MergePagesSmallerConsumer(VMAnonymousCache* source)
(off_t)page->cache_offset << PAGE_SHIFT);
if (sourcePage != NULL) {
DEBUG_PAGE_ACCESS_START(sourcePage);
ASSERT_PRINT(!sourcePage->busy, "page: %p", sourcePage);
source->RemovePage(sourcePage);
vm_page_free(source, sourcePage);
}
@@ -1002,9 +1004,12 @@ VMAnonymousCache::_MergeSwapPages(VMAnonymousCache* source)
if (swapBlock->swap_slots[i] != SWAP_SLOT_NONE) {
vm_page* page = source->LookupPage(
(off_t)(swapBlockPageIndex + i) << PAGE_SHIFT);
DEBUG_PAGE_ACCESS_START(page);
source->RemovePage(page);
vm_page_free(source, page);
if (page != NULL) {
DEBUG_PAGE_ACCESS_START(page);
ASSERT_PRINT(!page->busy, "page: %p", page);
source->RemovePage(page);
vm_page_free(source, page);
}
}
}
}