Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-07-10 23:09:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused SmartHeap class

Browse Source
This commit is contained in:
EnderIce2
2024-08-13 07:37:20 +03:00
parent e2e9cfe84d
commit 31dca2e9a6
5 changed files with 22 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
exec/elf/elf_loader.cpp
View File

@ -105,22 +105,22 @@ namespace Execute
std::vector<Elf64_Phdr> PhdrINTERP = ELFGetSymbolType_x86_64(fd, PT_INTERP);
foreach (auto Interp in PhdrINTERP)
{
Memory::SmartHeap InterpreterPath = Memory::SmartHeap(256);
fd->Read(InterpreterPath, 256, Interp.p_offset);
std::string interpreterPath;
interpreterPath.resize(256);
fd->Read(interpreterPath.data(), 256, Interp.p_offset);
debug("Interpreter: %s", interpreterPath.c_str());
FileNode *ifd = fs->GetByPath((const char *)InterpreterPath.Get(), TargetProcess->Info.RootNode);
FileNode *ifd = fs->GetByPath(interpreterPath.c_str(), TargetProcess->Info.RootNode);
if (ifd == nullptr)
{
warn("Failed to open interpreter file: %s",
(const char *)InterpreterPath.Get());
warn("Failed to open interpreter file: %s", interpreterPath.c_str());
continue;
}
else
{
if (GetBinaryType((const char *)InterpreterPath.Get()) != BinTypeELF)
if (GetBinaryType(interpreterPath) != BinTypeELF)
{
warn("Interpreter %s is not an ELF file",
(const char *)InterpreterPath.Get());
warn("Interpreter %s is not an ELF file", interpreterPath.c_str());
continue;
}
@ -322,23 +322,23 @@ namespace Execute
std::vector<Elf64_Phdr> PhdrINTERP = ELFGetSymbolType_x86_64(fd, PT_INTERP);
foreach (auto Interp in PhdrINTERP)
{
Memory::SmartHeap InterpreterPath = Memory::SmartHeap(256);
fd->Read(InterpreterPath, 256, Interp.p_offset);
InterpreterPath = InterpreterPath;
std::string interpreterPath;
interpreterPath.resize(256);
fd->Read(interpreterPath.data(), 256, Interp.p_offset);
debug("Interpreter: %s", (const char *)interpreterPath.c_str());
FileNode *ifd = fs->GetByPath((const char *)InterpreterPath.Get(), TargetProcess->Info.RootNode);
FileNode *ifd = fs->GetByPath(interpreterPath.c_str(), TargetProcess->Info.RootNode);
if (ifd == nullptr)
{
warn("Failed to open interpreter file: %s",
(const char *)InterpreterPath.Get());
warn("Failed to open interpreter file: %s", interpreterPath.c_str());
continue;
}
else
{
if (GetBinaryType((const char *)InterpreterPath.Get()) != BinTypeELF)
debug("ifd: %p, interpreter: %s", ifd, interpreterPath.c_str());
if (GetBinaryType(interpreterPath) != BinTypeELF)
{
warn("Interpreter %s is not an ELF file",
(const char *)InterpreterPath.Get());
warn("Interpreter %s is not an ELF file", interpreterPath.c_str());
continue;
}