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

[ExprConstant] Fix PR28314 - crash while evluating objectsize. 

This fixes a crash in code like:
```
struct A {
  struct B b;
  char c[1];
}

int foo(struct A* a) { return __builtin_object_size(a->c, 0); }
```

We wouldn't check whether the structs we were examining were invalid,
and getting the layout of an invalid struct is (unsurprisingly) A Bad
Thing. With this patch, we'll always return conservatively if we see an
invalid struct, since I'm assuming the presence of an invalid struct
means that our compilation failed (so having a conservative result isn't
such a big deal).

llvm-svn: 273911
This commit is contained in:
George Burgess IV 2016-06-27 19:40:41 +00:00
parent a2ca3eda5d
commit 4168d75888
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clang/lib/AST/ExprConstant.cpp
View File

@ -6540,25 +6540,32 @@ static const Expr *ignorePointerCastsAndParens(const Expr *E) {
///
/// Please note: this function is specialized for how __builtin_object_size
/// views "objects".
///
/// If this encounters an invalid RecordDecl, it will always return true.
static bool isDesignatorAtObjectEnd(const ASTContext &Ctx, const LValue &LVal) {
assert(!LVal.Designator.Invalid);
auto IsLastFieldDecl = [&Ctx](const FieldDecl *FD) {
if (FD->getParent()->isUnion())
auto IsLastOrInvalidFieldDecl = [&Ctx](const FieldDecl *FD, bool &Invalid) {
const RecordDecl *Parent = FD->getParent();
Invalid = Parent->isInvalidDecl();
if (Invalid || Parent->isUnion())
return true;
const ASTRecordLayout &Layout = Ctx.getASTRecordLayout(FD->getParent());
const ASTRecordLayout &Layout = Ctx.getASTRecordLayout(Parent);
return FD->getFieldIndex() + 1 == Layout.getFieldCount();
};
auto &Base = LVal.getLValueBase();
if (auto *ME = dyn_cast_or_null<MemberExpr>(Base.dyn_cast<const Expr *>())) {
if (auto *FD = dyn_cast<FieldDecl>(ME->getMemberDecl())) {
if (!IsLastFieldDecl(FD))
return false;
bool Invalid;
if (!IsLastOrInvalidFieldDecl(FD, Invalid))
return Invalid;
} else if (auto *IFD = dyn_cast<IndirectFieldDecl>(ME->getMemberDecl())) {
for (auto *FD : IFD->chain())
if (!IsLastFieldDecl(cast<FieldDecl>(FD)))
return false;
for (auto *FD : IFD->chain()) {
bool Invalid;
if (!IsLastOrInvalidFieldDecl(cast<FieldDecl>(FD), Invalid))
return Invalid;
}
}
}
@ -6581,8 +6588,9 @@ static bool isDesignatorAtObjectEnd(const ASTContext &Ctx, const LValue &LVal) {
return false;
BaseType = CT->getElementType();
} else if (auto *FD = getAsField(LVal.Designator.Entries[I])) {
if (!IsLastFieldDecl(FD))
return false;
bool Invalid;
if (!IsLastOrInvalidFieldDecl(FD, Invalid))
return Invalid;
BaseType = FD->getType();
} else {
assert(getAsBaseClass(LVal.Designator.Entries[I]) != nullptr &&

24
clang/test/Sema/builtin-object-size.c
View File

@ -52,3 +52,27 @@ void f6(void)
__builtin___memccpy_chk (buf, b, '\0', sizeof(b), __builtin_object_size (buf, 0));
__builtin___memccpy_chk (b, buf, '\0', sizeof(buf), __builtin_object_size (b, 0)); // expected-warning {{'__builtin___memccpy_chk' will always overflow destination buffer}}
}
int pr28314(void) {
struct {
struct InvalidField a; // expected-error{{has incomplete type}} expected-note 3{{forward declaration of 'struct InvalidField'}}
char b[0];
} *p;
struct {
struct InvalidField a; // expected-error{{has incomplete type}}
char b[1];
} *p2;
struct {
struct InvalidField a; // expected-error{{has incomplete type}}
char b[2];
} *p3;
int a = 0;
a += __builtin_object_size(&p->a, 0);
a += __builtin_object_size(p->b, 0);
a += __builtin_object_size(p2->b, 0);
a += __builtin_object_size(p3->b, 0);
return a;
}