Fixed a bug exposed when doing something like this: <program> -notanoption --help
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@293 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index db2c3f3..0584590 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -49,7 +49,8 @@
const char *Value = "";
const char *ArgName = "";
if (argv[i][0] != '-') { // Unnamed argument?
- Handler = getOpts()[""];
+ map<string, Option*>::iterator I = getOpts().find("");
+ Handler = I != getOpts().end() ? I->second : 0;
Value = argv[i];
} else { // We start with a - or --, eat dashes
ArgName = argv[i]+1;
@@ -63,8 +64,9 @@
++Value; // Advance to value...
if (*ArgName != 0) {
- string ArgNameStr(ArgName, ArgNameEnd); // Extract arg name part
- Handler = getOpts()[ArgNameStr];
+ // Extract arg name part
+ map<string, Option*>::iterator I = getOpts().find(string(ArgName, ArgNameEnd));
+ Handler = I != getOpts().end() ? I->second : 0;
}
}