Don't crash when applying an alloc_size attribute on a K&R function.

llvm-svn: 175867

diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 0a30163..1142e0d 100644 (file)
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -1097,7 +1097,11 @@ static void handleAllocSizeAttr(Sema &S, Decl *D, const AttributeList &Attr) {
   // In C++ the implicit 'this' function parameter also counts, and they are
   // counted from one.
   bool HasImplicitThisParam = isInstanceMethod(D);
-  unsigned NumArgs = getFunctionOrMethodNumArgs(D) + HasImplicitThisParam;
+  unsigned NumArgs;
+  if (hasFunctionProto(D))
+    NumArgs = getFunctionOrMethodNumArgs(D) + HasImplicitThisParam;
+  else
+    NumArgs = 0;
 
   SmallVector<unsigned, 8> SizeArgs;
 

diff --git a/clang/test/Sema/alloc_size.c b/clang/test/Sema/alloc_size.c
index e2f5298..6a580b5 100644 (file)
--- a/clang/test/Sema/alloc_size.c
+++ b/clang/test/Sema/alloc_size.c
@@ -24,3 +24,4 @@ void* fn9(unsigned) __attribute__((alloc_size(12345678901234567890123))); // exp
 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}}
+void* fn11() __attribute__((alloc_size(1))); // expected-error{{attribute parameter 1 is out of bounds}}