summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam McCall <sam.mccall@gmail.com>2019-12-09 12:04:05 +0100
committerSam McCall <sam.mccall@gmail.com>2019-12-09 12:24:23 +0100
commit966fac1941ea99e076a7654d229b27e1e6e4ad17 (patch)
tree89086a8ea5a143a65d3debff3095b69391f59d83
parentf3e6a61232640f2ec78b97d44cc0b5ba12676a0d (diff)
downloadbcm5719-llvm-966fac1941ea99e076a7654d229b27e1e6e4ad17.tar.gz
bcm5719-llvm-966fac1941ea99e076a7654d229b27e1e6e4ad17.zip
[clang][Tooling] Fix potential UB in ExpandResponseFilesCompilationDatabase
Summary: `vector::assign` will cause UB at here. fixes: https://github.com/clangd/clangd/issues/223 Reviewers: kadircet, sammccall, hokein Reviewed By: sammccall Subscribers: merge_guards_bot, ilya-biryukov, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D71172
-rw-r--r--clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp b/clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp
index 84936ba05b2..99298316718 100644
--- a/clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp
+++ b/clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp
@@ -61,7 +61,9 @@ private:
llvm::StringSaver Saver(Alloc);
llvm::cl::ExpandResponseFiles(Saver, Tokenizer, Argv, false, false, *FS,
llvm::StringRef(Cmd.Directory));
- Cmd.CommandLine.assign(Argv.begin(), Argv.end());
+ // Don't assign directly, Argv aliases CommandLine.
+ std::vector<std::string> ExpandedArgv(Argv.begin(), Argv.end());
+ Cmd.CommandLine = std::move(ExpandedArgv);
}
return Cmds;
}
OpenPOWER on IntegriCloud