nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SourceManager: use getBufferSize()

Browse Source 
Forming an out of bounds pointer to check if it's out
of bounds was undefined behavior.

llvm-svn: 146861
This commit is contained in:
Dylan Noblesmith
2011-12-19 08:51:05 +00:00
parent ac2bda8dd0
commit 2a8bc15230
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/Basic/SourceManager.cpp
View File

@@ -962,13 +962,13 @@ unsigned SourceManager::getColumnNumber(FileID FID, unsigned FilePos,
if (MyInvalid)
return 1;
const char *Buf = MemBuf->getBufferStart();
if (Buf + FilePos >= MemBuf->getBufferEnd()) {
if (FilePos >= MemBuf->getBufferSize()) {
if (Invalid)
*Invalid = MyInvalid;
return 1;
}
const char *Buf = MemBuf->getBufferStart();
unsigned LineStart = FilePos;
while (LineStart && Buf[LineStart-1] != '\n' && Buf[LineStart-1] != '\r')
--LineStart;
@@ -1524,9 +1524,10 @@ SourceLocation SourceManager::translateLineCol(FileID FID,
return FileLoc.getLocWithOffset(Size);
}
const llvm::MemoryBuffer *Buffer = Content->getBuffer(Diag, *this);
unsigned FilePos = Content->SourceLineCache[Line - 1];
const char *Buf = Content->getBuffer(Diag, *this)->getBufferStart() + FilePos;
unsigned BufLength = Content->getBuffer(Diag, *this)->getBufferEnd() - Buf;
const char *Buf = Buffer->getBufferStart() + FilePos;
unsigned BufLength = Buffer->getBufferSize() - FilePos;
if (BufLength == 0)
return FileLoc.getLocWithOffset(FilePos);