Added "id_idx" parameter to CheckPrintfArguments. This will be used

by CheckPrintfArguments to determine if a given printf function
accepts a va_arg argument.

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

diff --git a/Sema/Sema.h b/Sema/Sema.h
index ecf30626961d914266dd853ff1136896de67b89e..d373cc0400a6c3cb1672349575298fa148ab3697 100644 (file)
--- a/Sema/Sema.h
+++ b/Sema/Sema.h
@@ -426,8 +426,9 @@ private:
   void CheckFunctionCall(Expr *Fn, FunctionDecl *FDecl,
                          Expr** Args, unsigned NumArgsInCall);
 
-  void CheckPrintfArguments(Expr *Fn, FunctionDecl *FDecl, unsigned format_idx,
-                            Expr** Args, unsigned NumArgsInCall);
+  void CheckPrintfArguments(Expr *Fn, unsigned id_idx, FunctionDecl *FDecl,
+                            unsigned format_idx, Expr** Args,
+                            unsigned NumArgsInCall);
 };
 
 

diff --git a/Sema/SemaChecking.cpp b/Sema/SemaChecking.cpp
index 883cbb6e701749664ebc8002daeb7f92c11205a6..8cc3c6c147baca4370061edafef07add571ad2d6 100644 (file)
--- a/Sema/SemaChecking.cpp
+++ b/Sema/SemaChecking.cpp
@@ -57,7 +57,7 @@ Sema::CheckFunctionCall(Expr *Fn, FunctionDecl *FDecl,
       case id_vsprintf:  format_idx = 1; break;
       case id_vprintf:   format_idx = 1; break;
     }    
-    CheckPrintfArguments(Fn, FDecl, format_idx, Args, NumArgsInCall);
+    CheckPrintfArguments(Fn, i, FDecl, format_idx, Args, NumArgsInCall);
   }
 }
 
@@ -70,8 +70,9 @@ Sema::CheckFunctionCall(Expr *Fn, FunctionDecl *FDecl,
 ///  FormatGuard: Automatic Protection From printf Format String
 ///  Vulnerabilities, Proceedings of the 10th USENIX Security Symposium, 2001.
 void
-Sema::CheckPrintfArguments(Expr *Fn, FunctionDecl *FDecl, unsigned format_idx,
-                           Expr** Args, unsigned NumArgsInCall) {
+Sema::CheckPrintfArguments(Expr *Fn, unsigned id_idx, FunctionDecl *FDecl,
+                           unsigned format_idx, Expr** Args, 
+                           unsigned NumArgsInCall) {
                            
   assert( format_idx < NumArgsInCall );