Enhancements to the alternate (WIP) format string checking:

- Add ConversionSpecifier::consumesDataArgument() as a helper method
  to determine if a conversion specifier requires a matching argument.
- Add support for glibc-specific '%m' conversion
- Add an extra callback to HandleNull() for locations within the
  format specifier that have a null character

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

diff --git a/include/clang/Analysis/Analyses/PrintfFormatString.h b/include/clang/Analysis/Analyses/PrintfFormatString.h
index a70bd9b32deee7817557e985801046bf931e645f..c0863f25a83fae8c9e93f0293b46d5262bf7af3a 100644 (file)
--- a/include/clang/Analysis/Analyses/PrintfFormatString.h
+++ b/include/clang/Analysis/Analyses/PrintfFormatString.h
@@ -46,6 +46,8 @@ public:
    PercentArg,    // '%'
     // Objective-C specific specifiers.
    ObjCObjArg,    // '@'
+    // GlibC specific specifiers.
+   PrintErrno,    // 'm'
     // Specifier ranges.
    IntArgBeg = dArg,
    IntArgEnd = iArg,
@@ -68,6 +70,16 @@ public:
   const char *getStart() const {
     return Position;
   }
+       
+  bool consumesDataArgument() const {
+    switch (kind) {
+         case PercentArg:
+         case PrintErrno:
+               return false;
+         default:
+               return true;
+       }
+  }
   
   bool isObjCArg() const { return kind >= ObjCBeg && kind <= ObjCEnd; }
   bool isIntArg() const { return kind >= dArg && kind <= iArg; }

diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp
index bf1e8941152465f4b3dfd18537f5bf1880e25bb1..bb9ac8480a0eccad84983c0812671dc49edd3548 100644 (file)
--- a/lib/Analysis/PrintfFormatString.cpp
+++ b/lib/Analysis/PrintfFormatString.cpp
@@ -191,6 +191,12 @@ static FormatSpecifierResult ParseFormatSpecifier(FormatStringHandler &H,
     H.HandleIncompleteFormatSpecifier(Start, E - Start);
     return true;
   }
+       
+  if (*I == '\0') {
+       // Detect spurious null characters, which are likely errors.
+       H.HandleNullChar(I);
+       return true;
+  }
   
   // Finally, look for the conversion specifier.
   const char *conversionPosition = I++;
@@ -219,7 +225,9 @@ static FormatSpecifierResult ParseFormatSpecifier(FormatStringHandler &H,
     case 'n': k = ConversionSpecifier::OutIntPtrArg; break;
     case '%': k = ConversionSpecifier::PercentArg;   break;      
     // Objective-C.
-    case '@': k = ConversionSpecifier::ObjCObjArg; break;      
+    case '@': k = ConversionSpecifier::ObjCObjArg; break;
+       // Glibc specific.
+    case 'm': k = ConversionSpecifier::PrintErrno; break;
   }
   FS.setConversionSpecifier(ConversionSpecifier(conversionPosition, k));
 
@@ -246,7 +254,7 @@ bool clang::ParseFormatString(FormatStringHandler &H,
     // We have a format specifier.  Pass it to the callback.
     if (!H.HandleFormatSpecifier(FSR.getValue(), FSR.getStart(),
                                  I - FSR.getStart()))
-      return false;
+      return true;
   }  
   assert(I == E && "Format string not exhausted");      
   return false;