diff options
| author | Zachary Turner <zturner@google.com> | 2016-09-19 17:54:06 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2016-09-19 17:54:06 +0000 |
| commit | ecbb0bb1690cd59da0224d7b906f968356b1265c (patch) | |
| tree | 90951f44a7abb40b355e849a2e64cb09ec3ac900 /lldb/source/Target/Process.cpp | |
| parent | 495b211a6c775e6fbc00a1e3a91786f6a880b82e (diff) | |
| download | bcm5719-llvm-ecbb0bb1690cd59da0224d7b906f968356b1265c.tar.gz bcm5719-llvm-ecbb0bb1690cd59da0224d7b906f968356b1265c.zip | |
Fix more functions in Args to use StringRef.
This patch also marks the const char* versions as =delete to prevent
their use. This has the potential to cause build breakages on some
platforms which I can't compile. I have tested on Windows, Linux,
and OSX. Best practices for fixing broken callsites are outlined in
Args.h in a comment above the deleted function declarations.
Eventually we can remove these =delete declarations, but for now they
are important to make sure that all implicit conversions from
const char * are manually audited to make sure that they do not invoke a
conversion from nullptr.
llvm-svn: 281919
Diffstat (limited to 'lldb/source/Target/Process.cpp')
| -rw-r--r-- | lldb/source/Target/Process.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index f370676e73a..7837881fb82 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -416,6 +416,7 @@ Error ProcessLaunchCommandOptions::SetOptionValue( ExecutionContext *execution_context) { Error error; const int short_option = m_getopt_table[option_idx].val; + auto option_strref = llvm::StringRef::withNullAsEmpty(option_arg); switch (short_option) { case 's': // Stop at program entry point @@ -484,7 +485,7 @@ Error ProcessLaunchCommandOptions::SetOptionValue( { bool success; const bool disable_aslr_arg = - Args::StringToBoolean(option_arg, true, &success); + Args::StringToBoolean(option_strref, true, &success); if (success) disable_aslr = disable_aslr_arg ? eLazyBoolYes : eLazyBoolNo; else @@ -497,7 +498,8 @@ Error ProcessLaunchCommandOptions::SetOptionValue( case 'X': // shell expand args. { bool success; - const bool expand_args = Args::StringToBoolean(option_arg, true, &success); + const bool expand_args = + Args::StringToBoolean(option_strref, true, &success); if (success) launch_info.SetShellExpandArguments(expand_args); else @@ -515,7 +517,8 @@ Error ProcessLaunchCommandOptions::SetOptionValue( break; case 'v': - launch_info.GetEnvironmentEntries().AppendArgument(option_arg); + launch_info.GetEnvironmentEntries().AppendArgument( + llvm::StringRef::withNullAsEmpty(option_arg)); break; default: |
