system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 04:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

disasm: Don't fail when trying to disassemble empty files

Browse source 
Given an empty file, disasm would try to create a zero-size memory
mapping of that file, which would fail with EINVAL.
This commit is contained in:
Rummskartoffel 2022-01-16 14:24:21 +01:00 committed by Andreas Kling
parent 0aa5725f72
commit 487377d1d7
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/disasm.cpp
View file

@ -10,6 +10,7 @@
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/MappedFile.h>
#include <LibCore/System.h>
#include <LibELF/Image.h>
#include <LibMain/Main.h>
#include <LibX86/Disassembler.h>
@ -27,7 +28,14 @@ ErrorOr<int> serenity_main(Main::Arguments args)
args_parser.add_positional_argument(path, "Path to i386 binary file", "path");
args_parser.parse(args);
auto file = TRY(Core::MappedFile::map(path));
RefPtr<Core::MappedFile> file;
u8 const* asm_data = nullptr;
size_t asm_size = 0;
if ((TRY(Core::System::stat(path))).st_size > 0) {
file = TRY(Core::MappedFile::map(path));
asm_data = static_cast<u8 const*>(file->data());
asm_size = file->size();
}
struct Symbol {
size_t value;
@ -41,8 +49,6 @@ ErrorOr<int> serenity_main(Main::Arguments args)
};
Vector<Symbol> symbols;
u8 const* asm_data = static_cast<u8 const*>(file->data());
size_t asm_size = file->size();
size_t file_offset = 0;
Vector<Symbol>::Iterator current_symbol = symbols.begin();
OwnPtr<X86::ELFSymbolProvider> symbol_provider; // nullptr for non-ELF disassembly.