RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:17:35 +00:00
Code Issues Activity Actions

Zero out VirtualFileSystem::s_the in initializeGlobals().

Browse source 
This catches attempts to access the vfs before it's been constructed.
This commit is contained in:
Andreas Kling 2018-10-22 12:54:19 +02:00
parent e4afa2a041
commit ba185e3eba
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
VirtualFileSystem/VirtualFileSystem.cpp
View file

@ -7,11 +7,6 @@
//#define VFS_DEBUG //#define VFS_DEBUG
void VirtualFileSystem::initializeGlobals()
{
FileSystem::initializeGlobals();
}
static dword encodedDevice(unsigned major, unsigned minor) static dword encodedDevice(unsigned major, unsigned minor)
{ {
return (minor & 0xff) | (major << 8) | ((minor & ~0xff) << 12); return (minor & 0xff) | (major << 8) | ((minor & ~0xff) << 12);
@ -25,6 +20,12 @@ VirtualFileSystem& VirtualFileSystem::the()
return *s_the; return *s_the;
} }
void VirtualFileSystem::initializeGlobals()
{
s_the = nullptr;
FileSystem::initializeGlobals();
}
VirtualFileSystem::VirtualFileSystem() VirtualFileSystem::VirtualFileSystem()
{ {
#ifdef VFS_DEBUG #ifdef VFS_DEBUG