From 5b55f6dba9d905e26729961a146de825277c9d79 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Mon, 10 Jul 2017 21:56:22 +0900 Subject: [PATCH] vfs.cpp: Fix gcc6 crash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Duval --- src/system/kernel/fs/vfs.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index ea477739d4..f3d562d451 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -7275,7 +7275,9 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags, FileDeviceDeleter() : id(-1) {} ~FileDeviceDeleter() { - KDiskDeviceManager::Default()->DeleteFileDevice(id); + KDiskDeviceManager* ddm = KDiskDeviceManager::Default(); + if (ddm != NULL) + ddm->DeleteFileDevice(id); } partition_id id; @@ -7780,8 +7782,11 @@ fs_unmount(char* path, dev_t mountID, uint32 flags, bool kernel) partition->SetVolumeID(-1); partition->SetMountCookie(NULL); - if (mount->owns_file_device) - KDiskDeviceManager::Default()->DeleteFileDevice(partition->ID()); + if (mount->owns_file_device) { + KDiskDeviceManager* ddm = KDiskDeviceManager::Default(); + if (ddm != NULL) + ddm->DeleteFileDevice(partition->ID()); + } partition->Unregister(); }