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

bfs: Fixed removing a listener that was never added.

Browse Source 
* When the tree constructor failed, the InodeAllocator would try to remove
  the tree from the transaction. However, in that case, it was never added
  to it.
* Inode::fTree is no longer set if the tree constructor failed.
* This fixes bug #10089.
This commit is contained in:
Axel Dörfler
2013-10-14 23:21:47 +02:00
parent 45a5246706
commit aeee1f7ec7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/Inode.cpp
+10 -3
View File
@@ -236,11 +236,18 @@ InodeAllocator::CreateTree()
if ((fInode->Mode() & S_INDEX_TYPES) == 0) if ((fInode->Mode() & S_INDEX_TYPES) == 0)
fInode->Node().mode |= HOST_ENDIAN_TO_BFS_INT32(S_STR_INDEX); fInode->Node().mode |= HOST_ENDIAN_TO_BFS_INT32(S_STR_INDEX);
BPlusTree* tree = fInode->fTree BPlusTree* tree = new(std::nothrow) BPlusTree(*fTransaction, fInode);
= new(std::nothrow) BPlusTree(*fTransaction, fInode); if (tree == NULL)
if (tree == NULL || tree->InitCheck() < B_OK)
return B_ERROR; return B_ERROR;
status_t status = tree->InitCheck();
if (status != B_OK) {
delete tree;
return status;
}
fInode->fTree = tree;
if (fInode->IsRegularNode()) { if (fInode->IsRegularNode()) {
if (tree->Insert(*fTransaction, ".", fInode->ID()) < B_OK if (tree->Insert(*fTransaction, ".", fInode->ID()) < B_OK
|| tree->Insert(*fTransaction, "..", || tree->Insert(*fTransaction, "..",