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

nfs4: Fix error handling issues in Inode::Open() and Inode::Create()

Browse Source 
This fixes CID 991498.
This commit is contained in:
Pawel Dziepak
2013-03-19 02:37:44 +01:00
parent 55ca54ccf5
commit 80f94193c4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/InodeRegular.cpp
+11 -4
View File
@@ -74,10 +74,15 @@ Inode::Create(const char* name, int mode, int perms, OpenFileCookie* cookie,
cookie->fMode = mode; cookie->fMode = mode;
cookie->fLocks = NULL; cookie->fLocks = NULL;
OpenState* state = new OpenState; OpenState* state = new(std::nothrow) OpenState;
if (state == NULL)
return B_NO_MEMORY;
status_t result = CreateState(name, mode, perms, state, data); status_t result = CreateState(name, mode, perms, state, data);
if (result != B_OK) if (result != B_OK) {
delete state;
return result; return result;
}
cookie->fOpenState = state; cookie->fOpenState = state;
cookie->fFileSystem = fFileSystem; cookie->fFileSystem = fFileSystem;
@@ -105,7 +110,7 @@ Inode::Open(int mode, OpenFileCookie* cookie)
if (fOpenState == NULL) { if (fOpenState == NULL) {
RevalidateFileCache(); RevalidateFileCache();
OpenState* state = new OpenState; OpenState* state = new(std::nothrow) OpenState;
if (state == NULL) if (state == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -113,8 +118,10 @@ Inode::Open(int mode, OpenFileCookie* cookie)
state->fFileSystem = fFileSystem; state->fFileSystem = fFileSystem;
state->fMode = mode & O_RWMASK; state->fMode = mode & O_RWMASK;
status_t result = OpenFile(state, mode, &data); status_t result = OpenFile(state, mode, &data);
if (result != B_OK) if (result != B_OK) {
delete state;
return result; return result;
}
fFileSystem->AddOpenFile(state); fFileSystem->AddOpenFile(state);
fOpenState = state; fOpenState = state;