Skip to content

[lldb-moduleimport-test] Validate input to prevent crashes. #15981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2018
Merged

[lldb-moduleimport-test] Validate input to prevent crashes. #15981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions test/DebugInfo/DumpDeclFromMangledName.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@
// RUN: sed -ne '/--->/s/^.*---> *//p' < %S/Inputs/decl-reconstr-names.txt > %t.check

// RUN: %target-build-swift -emit-executable %s -g -o %t/DeclReconstr -emit-module

// Input validation tests.
// RUN: not %lldb-moduleimport-test patatino 2>&1 | %FileCheck %s \
// RUN: --check-prefix=INVALID-INPUT
// INVALID-INPUT: patatino does not exists, exiting.

// RUN: not %lldb-moduleimport-test %t/DeclReconstr \
// RUN: --decl-from-mangled=patatino 2>&1 | \
// RUN: %FileCheck %s --check-prefix=INVALID-DECL
// INVALID-DECL: patatino does not exists, exiting.

// RUN: not %lldb-moduleimport-test %t/DeclReconstr \
// RUN: --type-from-mangled=patatino 2>&1 | \
// RUN: %FileCheck %s --check-prefix=INVALID-TYPE
// INVALID-TYPE: patatino does not exists, exiting.

// RUN: %lldb-moduleimport-test %t/DeclReconstr \
// RUN: -decl-from-mangled=%t.input > %t.output 2>&1
// RUN: diff %t.check %t.output
Expand Down
22 changes: 22 additions & 0 deletions tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,28 @@ int main(int argc, char **argv) {
DumpTypeFromMangled.removeArgument();
InputNames.removeArgument();

auto validateInputFile = [](std::string Filename) {
if (Filename.empty())
return true;
if (!llvm::sys::fs::exists(llvm::Twine(Filename))) {
llvm::errs() << Filename << " does not exists, exiting.\n";
return false;
}
if (!llvm::sys::fs::is_regular_file(llvm::Twine(Filename))) {
llvm::errs() << Filename << " is not a regular file, exiting.\n";
return false;
}
return true;
};

for (auto &InputFilename : InputNames)
if (!validateInputFile(InputFilename))
return 1;
if (!validateInputFile(DumpTypeFromMangled))
return 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DumpTypeFromMangled and DumpDeclFromMangled are file names?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes (text files). Would you like me to rename them to be more self-explanatory? Thanks!

if (!validateInputFile(DumpDeclFromMangled))
return 1;

// Fetch the serialized module bitstreams from the Mach-O files and
// register them with the module loader.
llvm::SmallVector<std::pair<char *, uint64_t>, 8> Modules;
Expand Down