diff options
| author | Will Dietz <wdietz2@illinois.edu> | 2013-10-13 22:09:26 +0000 |
|---|---|---|
| committer | Will Dietz <wdietz2@illinois.edu> | 2013-10-13 22:09:26 +0000 |
| commit | 4df7c5baa1dfe2d9de7eef2600c9ac325e9fdcd6 (patch) | |
| tree | fe26a346afd3acc887977295e4ea492b40e8a97d /lib/MC/SubtargetFeature.cpp | |
| parent | cf1f4c7dd19458f47a9ba720d90eec507d66c94a (diff) | |
| download | external_llvm-4df7c5baa1dfe2d9de7eef2600c9ac325e9fdcd6.zip external_llvm-4df7c5baa1dfe2d9de7eef2600c9ac325e9fdcd6.tar.gz external_llvm-4df7c5baa1dfe2d9de7eef2600c9ac325e9fdcd6.tar.bz2 | |
MC: Don't assume incoming StringRef's are null terminated.
This can happen when processing command line arguments, which
are often stored as std::string's and later turned into
StringRef's via std::string::data(). Unfortunately this
is not guaranteed to return a null-terminated string
until C++11, causing breakage on platforms that don't do this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192558 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/SubtargetFeature.cpp')
| -rw-r--r-- | lib/MC/SubtargetFeature.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/MC/SubtargetFeature.cpp b/lib/MC/SubtargetFeature.cpp index 68d68ff..2fb91f2 100644 --- a/lib/MC/SubtargetFeature.cpp +++ b/lib/MC/SubtargetFeature.cpp @@ -121,13 +121,10 @@ void SubtargetFeatures::AddFeature(const StringRef String, /// Find KV in array using binary search. static const SubtargetFeatureKV *Find(StringRef S, const SubtargetFeatureKV *A, size_t L) { - // Make the lower bound element we're looking for - SubtargetFeatureKV KV; - KV.Key = S.data(); // Determine the end of the array const SubtargetFeatureKV *Hi = A + L; // Binary search the array - const SubtargetFeatureKV *F = std::lower_bound(A, Hi, KV); + const SubtargetFeatureKV *F = std::lower_bound(A, Hi, S); // If not found then return NULL if (F == Hi || StringRef(F->Key) != S) return NULL; // Return the found array item |