replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweak CXLoadedDiagnosticSetImpl::makeString() to include an extra null character, and change the creation of the FixIT's string to again just rely on this string (instead of duplicating it when calling createCXString). 

llvm-svn: 144389
This commit is contained in:
Ted Kremenek 2011-11-11 15:19:48 +00:00
parent 089cc53232
commit 70394cf76c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang/tools/libclang/CXLoadedDiagnostic.cpp
View File

@ -55,8 +55,11 @@ public:
llvm::StringRef CXLoadedDiagnosticSetImpl::makeString(const char *blob,
unsigned bloblen) {
char *mem = Alloc.Allocate<char>(bloblen);
char *mem = Alloc.Allocate<char>(bloblen + 1);
memcpy(mem, blob, bloblen);
// Add a null terminator for those clients accessing the buffer
// like a c-string.
mem[bloblen] = '\0';
return llvm::StringRef(mem, bloblen);
}
@ -100,7 +103,7 @@ CXSourceLocation CXLoadedDiagnostic::getLocation() const {
}
CXString CXLoadedDiagnostic::getSpelling() const {
return cxstring::createCXString(Spelling, false);
return cxstring::createCXString(Spelling, false);
}
CXString CXLoadedDiagnostic::getDiagnosticOption(CXString *Disable) const {
@ -242,7 +245,7 @@ public:
if (errorString)
*errorString = createCXString("");
}
CXDiagnosticSet load(const char *file);
};
}
@ -626,8 +629,8 @@ LoadResult DiagLoader::readDiagnosticBlock(llvm::BitstreamCursor &Stream,
llvm::StringRef RetStr;
if (readString(TopDiags, RetStr, "FIXIT", Record, BlobStart, BlobLen))
return Failure;
D->FixIts.push_back(std::make_pair(SR, createCXString(RetStr)));
continue;
D->FixIts.push_back(std::make_pair(SR, createCXString(RetStr, false)));
continue;
}
case serialized_diags::RECORD_DIAG: {