Skip to content

[llvm-objcopy] Check for missing argument values #70710

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 3 commits into from
May 22, 2024
Merged

[llvm-objcopy] Check for missing argument values #70710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
735214f
[llvm-objcopy] Check for missing argument values
quic-akaryaki Oct 30, 2023
17b976a
Explcitly check for argument name in the test.
quic-akaryaki Nov 6, 2023
502219c
Add the number of missing arguments in the test for checking.
quic-akaryaki Nov 13, 2023
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
6 changes: 6 additions & 0 deletions llvm/test/tools/llvm-objcopy/tool-options.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## An error must be reported if a required argument value is missing.
# RUN: not llvm-objcopy --only-section 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE-ONLY-SECTION %s
# CHECK-NO-VALUE-ONLY-SECTION: error: argument to '--only-section' is missing (expected 1 value(s))

# RUN: not llvm-objcopy -O 2>&1 | FileCheck --check-prefix=CHECK-NO-VALUE-O %s
# CHECK-NO-VALUE-O: error: argument to '-O' is missing (expected 1 value(s))
6 changes: 6 additions & 0 deletions llvm/tools/llvm-objcopy/ObjcopyOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,12 @@ objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
llvm::opt::InputArgList InputArgs =
T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);

if (MissingArgumentCount)
return createStringError(
errc::invalid_argument,
"argument to '%s' is missing (expected %d value(s))",
InputArgs.getArgString(MissingArgumentIndex), MissingArgumentCount);

if (InputArgs.size() == 0 && DashDash == RawArgsArr.end()) {
printHelp(T, errs(), ToolType::Objcopy);
exit(1);
Expand Down
Loading