From 174930db339bb7213353db9e7b5aa94ecf4c12ea Mon Sep 17 00:00:00 2001 From: Nuno Lopes <nunoplopes@sapo.pt> Date: Mon, 18 Jun 2012 16:39:04 +0000 Subject: [PATCH] fix PR13071 / rdar://problem/11634669 : crash on invalid function decl with alloc_size attribute git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158663 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaDeclAttr.cpp | 6 ++++++ test/Sema/alloc_size.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index 561b624167a..e8682d78afa 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -923,6 +923,12 @@ static void possibleTransparentUnionPointerType(QualType &T) { } static void handleAllocSizeAttr(Sema &S, Decl *D, const AttributeList &Attr) { + if (!isFunctionOrMethod(D)) { + S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) + << "alloc_size" << ExpectedFunctionOrMethod; + return; + } + if (!checkAttributeAtLeastNumArgs(S, Attr, 1)) return; diff --git a/test/Sema/alloc_size.c b/test/Sema/alloc_size.c index ae3b4763ccd..e2f52987d1d 100644 --- a/test/Sema/alloc_size.c +++ b/test/Sema/alloc_size.c @@ -20,3 +20,7 @@ void* fn7(unsigned) __attribute__((alloc_size)); // expected-error {{attribute t void *fn8(int, int) __attribute__((alloc_size(1, 1))); // OK void* fn9(unsigned) __attribute__((alloc_size(12345678901234567890123))); // expected-warning {{integer constant is too large for its type}} // expected-error {{attribute parameter 1 is out of bounds}} + +void* fn10(size_t, size_t) __attribute__((alloc_size(1,2))); // expected-error{{redefinition of parameter}} \ + // expected-error{{a parameter list without types is only allowed in a function definition}} \ + // expected-warning{{alloc_size attribute only applies to functions and methods}} -- GitLab