Fix a crash Anders' was seeing due to free'ing an invalid pointer

caused by my previous commit.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62613 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Parse/DeclSpec.h b/include/clang/Parse/DeclSpec.h
index c351e30bf2fd6db7a8812fe5a8878414034213e6..d4ac25a250927046860d23d179638251d0a752de 100644 (file)
--- a/include/clang/Parse/DeclSpec.h
+++ b/include/clang/Parse/DeclSpec.h
@@ -521,6 +521,16 @@ struct DeclaratorChunk {
     /// there are no arguments specified.
     ParamInfo *ArgInfo;
     
+    /// freeArgs - reset the argument list to having zero arguments.  This is
+    /// used in various places for error recovery.
+    void freeArgs() {
+      if (DeleteArgInfo) {
+        delete[] ArgInfo;
+        DeleteArgInfo = false;
+      }
+      NumArgs = 0;
+    }
+    
     void destroy() {
       if (DeleteArgInfo)
         delete[] ArgInfo;

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index a5825408590ba1907110398cf3a2ac23dc5b6ac2..d5d83be87d0e503b4ad9b4485daeed11daedc6df 100644 (file)
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -1202,12 +1202,7 @@ bool Sema::CheckDestructorDeclarator(Declarator &D, QualType &R,
     Diag(D.getIdentifierLoc(), diag::err_destructor_with_params);
 
     // Delete the parameters.
-    DeclaratorChunk::FunctionTypeInfo &FTI = D.getTypeObject(0).Fun;
-    if (FTI.NumArgs) {
-      delete [] FTI.ArgInfo;
-      FTI.NumArgs = 0;
-      FTI.ArgInfo = 0;
-    }
+    D.getTypeObject(0).Fun.freeArgs();
   }
 
   // Make sure the destructor isn't variadic.  
@@ -1264,12 +1259,7 @@ bool Sema::CheckConversionDeclarator(Declarator &D, QualType &R,
     Diag(D.getIdentifierLoc(), diag::err_conv_function_with_params);
 
     // Delete the parameters.
-    DeclaratorChunk::FunctionTypeInfo &FTI = D.getTypeObject(0).Fun;
-    if (FTI.NumArgs) {
-      delete [] FTI.ArgInfo;
-      FTI.NumArgs = 0;
-      FTI.ArgInfo = 0;
-    }
+    D.getTypeObject(0).Fun.freeArgs();
   }
 
   // Make sure the conversion function isn't variadic.