summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-11-19 21:12:39 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-11-19 21:12:39 +0000
commit09d689f90c745119a320c0808d775d5c60aaaade (patch)
tree7c7ac1b48cb13bc75a3f405eb2c60e3bb9c50771 /llvm/lib
parent92045bc37c84ff6e4a819685879d062a57bc8b45 (diff)
downloadbcm5719-llvm-09d689f90c745119a320c0808d775d5c60aaaade.tar.gz
bcm5719-llvm-09d689f90c745119a320c0808d775d5c60aaaade.zip
Make it explicit that nulls are not allowed in names.
The object files we support use null terminated strings, so there is no way to support these. This patch adds an assert to catch bad API use and an error check in the .ll parser. llvm-svn: 195155
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/AsmParser/LLLexer.cpp4
-rw-r--r--llvm/lib/IR/Value.cpp2
2 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/AsmParser/LLLexer.cpp b/llvm/lib/AsmParser/LLLexer.cpp
index 1e6085b443f..3c384f5fcca 100644
--- a/llvm/lib/AsmParser/LLLexer.cpp
+++ b/llvm/lib/AsmParser/LLLexer.cpp
@@ -275,6 +275,10 @@ lltok::Kind LLLexer::LexAt() {
if (CurChar == '"') {
StrVal.assign(TokStart+2, CurPtr-1);
UnEscapeLexed(StrVal);
+ if (StringRef(StrVal).find_first_of(0) != StringRef::npos) {
+ Error("Null bytes are not allowed in names");
+ return lltok::Error;
+ }
return lltok::GlobalVar;
}
}
diff --git a/llvm/lib/IR/Value.cpp b/llvm/lib/IR/Value.cpp
index 62a3b31c18b..2c90383edd8 100644
--- a/llvm/lib/IR/Value.cpp
+++ b/llvm/lib/IR/Value.cpp
@@ -182,6 +182,8 @@ void Value::setName(const Twine &NewName) {
SmallString<256> NameData;
StringRef NameRef = NewName.toStringRef(NameData);
+ assert(NameRef.find_first_of(0) == StringRef::npos &&
+ "Null bytes are not allowed in names");
// Name isn't changing?
if (getName() == NameRef)
OpenPOWER on IntegriCloud