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

Fix crash of array bounds checking under 64-bit. 

There might be other, similar bugs lurking there.

llvm-svn: 59974
This commit is contained in:
Sebastian Redl 2008-11-24 19:35:33 +00:00
parent 01c414c070
commit 81c1e1306c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Analysis/BasicConstraintManager.cpp
View File

@ -369,8 +369,14 @@ BasicConstraintManager::AssumeInBound(const GRState* St, SVal Idx,
}
const llvm::APSInt& Zero = getBasicVals().getZeroWithPtrWidth(false);
const llvm::APSInt& IdxV = cast<nonloc::ConcreteInt>(Idx).getValue();
const llvm::APSInt& UBV = cast<nonloc::ConcreteInt>(UpperBound).getValue();
llvm::APSInt IdxV = cast<nonloc::ConcreteInt>(Idx).getValue();
// IdxV might be too narrow.
if (IdxV.getBitWidth() < Zero.getBitWidth())
IdxV.extend(Zero.getBitWidth());
// UBV might be too narrow, too.
llvm::APSInt UBV = cast<nonloc::ConcreteInt>(UpperBound).getValue();
if (UBV.getBitWidth() < Zero.getBitWidth())
UBV.extend(Zero.getBitWidth());
bool InBound = (Zero <= IdxV) && (IdxV < UBV);

9
clang/lib/Analysis/RegionStore.cpp
View File

@ -254,12 +254,15 @@ SVal RegionStoreManager::getLValueElement(const GRState* St,
if ((CI1 = dyn_cast<nonloc::ConcreteInt>(&Idx)) &&
(CI2 = dyn_cast<nonloc::ConcreteInt>(&Offset))) {
// Temporary SVal to hold a potential signed APSInt.
// Temporary SVal to hold a potential signed and extended APSInt.
SVal SignedInt;
// Index might be unsigned. We have to convert it to signed.
if (CI2->getValue().isUnsigned()) {
// Index might be unsigned. We have to convert it to signed. It might also
// be less wide than the size. We have to extend it.
if (CI2->getValue().isUnsigned() ||
CI2->getValue().getBitWidth() < CI1->getValue().getBitWidth()) {
llvm::APSInt SI = CI2->getValue();
SI.extend(CI1->getValue().getBitWidth());
SI.setIsSigned(true);
SignedInt = nonloc::ConcreteInt(getBasicVals().getValue(SI));
CI2 = cast<nonloc::ConcreteInt>(&SignedInt);