enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 15:34:31 +00:00
Code Issues Actions Releases Wiki Activity

fix(kernel/vfs): accessing null pointer

Browse Source
This commit is contained in:
EnderIce2 2025-04-07 07:42:27 +00:00
parent 25713e0f13
commit eb89b060f6
Signed by: enderice2
GPG Key ID: FEB6B8A8507BA62E
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kernel/storage/fs/ramfs.cpp
View File

@ -91,9 +91,9 @@ namespace vfs
node->Name.assign(basename, length); node->Name.assign(basename, length);
node->Mode = Mode; node->Mode = Mode;
auto &&file = Files.insert(std::make_pair(NextInode, node)); auto file = Files.insert(std::make_pair(NextInode, node));
assert(file.second == true); assert(file.second == true);
*Result = &file.first->second->Node; *Result = &Files.at(NextInode)->Node;
if (Parent) if (Parent)
Parent->AddChild(node); Parent->AddChild(node);
NextInode++; NextInode++;

8
Kernel/storage/fs/ustar.cpp
View File

@ -159,13 +159,13 @@ namespace vfs
node->Name.assign(basename, length); node->Name.assign(basename, length);
node->Path.assign(Name, strlen(Name)); node->Path.assign(Name, strlen(Name));
auto &&file = Files.insert(std::make_pair(NextInode, node)); auto file = Files.insert(std::make_pair(NextInode, node));
assert(file.second == true); assert(file.second == true);
*Result = &file.first->second->Node; *Result = &Files.at(NextInode)->Node;
if (Parent) if (Parent)
{ {
Parent->Children.push_back(file.first->second); Parent->Children.push_back(Files.at(NextInode));
file.first->second->Parent = Parent; Files.at(NextInode)->Parent = Parent;
} }
NextInode++; NextInode++;
return 0; return 0;