maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix 2 cases of uninitialized reads of an invalid PresumedLoc. 

The code in CGExpr was added back in 2012 (r165536) but not exercised in tests
until recently.

Detected on the MemorySanitizer bootstrap bot.

llvm-svn: 190521
This commit is contained in:
Evgeniy Stepanov 2013-09-11 12:33:58 +00:00
parent 2b3f143f23
commit a98799fe4b
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/CodeGen/CGExpr.cpp
View File

@ -2095,8 +2095,8 @@ llvm::Constant *CodeGenFunction::EmitCheckSourceLocation(SourceLocation Loc) {
PLoc.isValid() ? cast<llvm::Constant>(
Builder.CreateGlobalStringPtr(PLoc.getFilename()))
: llvm::Constant::getNullValue(Int8PtrTy),
Builder.getInt32(PLoc.getLine()),
Builder.getInt32(PLoc.getColumn())
Builder.getInt32(PLoc.isValid() ? PLoc.getLine() : 0),
Builder.getInt32(PLoc.isValid() ? PLoc.getColumn() : 0)
};
return llvm::ConstantStruct::getAnon(Data);

28
clang/tools/libclang/CXSourceLocation.cpp
View File

@ -266,7 +266,7 @@ void clang_getPresumedLocation(CXSourceLocation location,
CXString *filename,
unsigned *line,
unsigned *column) {
if (!isASTUnitSourceLocation(location)) {
// Other SourceLocation implementations do not support presumed locations
// at this time.
@ -276,20 +276,22 @@ void clang_getPresumedLocation(CXSourceLocation location,
SourceLocation Loc = SourceLocation::getFromRawEncoding(location.int_data);
if (!location.ptr_data[0] || Loc.isInvalid())
if (!location.ptr_data[0] || Loc.isInvalid()) {
createNullLocation(filename, line, column);
else {
const SourceManager &SM =
*static_cast<const SourceManager*>(location.ptr_data[0]);
PresumedLoc PreLoc = SM.getPresumedLoc(Loc);
if (filename)
*filename = cxstring::createRef(PreLoc.getFilename());
if (line)
*line = PreLoc.getLine();
if (column)
*column = PreLoc.getColumn();
return;
}
const SourceManager &SM =
*static_cast<const SourceManager *>(location.ptr_data[0]);
PresumedLoc PreLoc = SM.getPresumedLoc(Loc);
if (PreLoc.isInvalid()) {
createNullLocation(filename, line, column);
return;
}
if (filename) *filename = cxstring::createRef(PreLoc.getFilename());
if (line) *line = PreLoc.getLine();
if (column) *column = PreLoc.getColumn();
}
void clang_getInstantiationLocation(CXSourceLocation location,