From f87dd6dceb506ad3c779cd5c095270abf1c051e0 Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Tue, 29 Oct 2013 19:16:25 +0100 Subject: [PATCH] nfs4: FileSystem::~FileSystem() make sure fServer is valid --- src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp index 51c1600c250..fa000a13ead 100644 --- a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp @@ -30,6 +30,7 @@ FileSystem::FileSystem(const MountConfiguration& configuration) fNamedAttrs(true), fPath(NULL), fRoot(NULL), + fServer(NULL), fId(1), fConfiguration(configuration) { @@ -44,9 +45,12 @@ FileSystem::FileSystem(const MountConfiguration& configuration) FileSystem::~FileSystem() { - NFS4Server* server = reinterpret_cast(fServer->PrivateData()); - if (server != NULL) - server->RemoveFileSystem(this); + if (fServer != NULL) { + NFS4Server* server + = reinterpret_cast(fServer->PrivateData()); + if (server != NULL) + server->RemoveFileSystem(this); + } mutex_destroy(&fDelegationLock); mutex_destroy(&fOpenLock);