Adding initializer to checked pointers

Author: Machiry

tools/checked-c-convert/RewriteUtils.cpp

@@ -12,7 +12,7 @@
 #include <algorithm>
 #include <map>
 #include <sstream>
-
+#include "clang/AST/Type.h"
 #include "RewriteUtils.h"
 #include "MappingVisitor.h"
 #include "Utils.h"
@@ -168,6 +168,11 @@ void rewrite( VarDecl               *VD,
       SourceLocation eqLoc = VD->getInitializerStartLoc();
       TR.setEnd(eqLoc);
       sRewrite = sRewrite + " = ";
+    } else {
+      // DAMN, there is no initializer, lets add it.
+      if(isPointerType(VD)) {
+        sRewrite = sRewrite + " = NULL";
+      }
     }
 
     // Is it a variable type? This is the easy case, we can re-write it
@@ -242,6 +247,10 @@ void rewrite( VarDecl               *VD,
           if (Expr *E = VDL->getInit()) {
             newMLDecl << " = ";
             E->printPretty(newMLDecl, nullptr, A.getPrintingPolicy());
+          } else {
+            if(isPointerType(VDL)) {
+              newMLDecl << " = NULL";
+            }
           }
           newMLDecl << ";\n";
         }

tools/checked-c-convert/Utils.cpp

@@ -189,4 +189,8 @@ bool isFunctionAllocator(std::string funcName) {
 
 float getTimeSpentInSeconds(clock_t startTime) {
   return float(clock() - startTime)/CLOCKS_PER_SEC;
+}
+
+bool isPointerType(clang::VarDecl *VD) {
+  return VD->getType().getTypePtr()->isPointerType();
 }

tools/checked-c-convert/Utils.h

@@ -58,5 +58,8 @@ bool functionHasVarArgs(clang::FunctionDecl *FD);
 // check if the function is a allocator.
 bool isFunctionAllocator(std::string funcName);
 
+// Is the given variable built  in type?
+bool isPointerType(clang::VarDecl *VD);
+
 clang::SourceLocation getFunctionDeclarationEnd(clang::FunctionDecl *FD, clang::SourceManager &S);
 #endif

tools/checked-c-convert/functests/arr/basic_inter.expected.c

@@ -23,17 +23,17 @@ int func(int *ptr, int *iptr : itype(_Ptr<int> ) , int *wild) {/*ARR:ptr*/
 int main() {
   int a, b, c;
   // this will be Ptr
-  _Ptr<int> ap;
+  _Ptr<int> ap = NULL;
   // this will be WILD
   int *bp;
   // this will be _Ptr
-  _Ptr<int> cp;
+  _Ptr<int> cp = NULL;
   // this will be _Ptr
-  _Ptr<int> ap1;
+  _Ptr<int> ap1 = NULL;
   // this will be WILD
   int *bp1;
   // this will be _Ptr
-  _Ptr<int> cp1;
+  _Ptr<int> cp1 = NULL;
 
 
   ap1 = &a;

tools/checked-c-convert/functests/arr/basic_inter_field.expected.c

@@ -18,7 +18,7 @@ _Ptr<int> func(_Ptr<int> ptr, char *arrptr) {/*ARR:arrptr*/
 
 int main() {
   int a;
-  _Ptr<int> b;
+  _Ptr<int> b = NULL;
   char *wil;
   wil = 0xdeadbeef;
   b = func(&a, wil);

tools/checked-c-convert/functests/arr/basic_local.expected.c

@@ -7,7 +7,7 @@ int main() {
   int *a;/*ARR:a*/
   // c also should be identified as 
   // _Ptr as we do not use it.
-  _Ptr<int> c;
+  _Ptr<int> c = NULL;
   // we will make this wild.
   int *d;
   int b;

tools/checked-c-convert/functests/ntarr/basic_field_local.expected.c

@@ -21,7 +21,7 @@ typedef struct {
 
 int main() {
   foo obj;
-  _Nt_array_ptr<char> bp;
+  _Nt_array_ptr<char> bp = NULL;
   float b;
   foo2 obj2;
   int hel;

tools/checked-c-convert/functests/ntarr/basic_inter.expected.c

@@ -25,17 +25,17 @@ int func(int *ptr, int *iptr : itype(_Ptr<int> ) , int *wild) {/*ARR:ptr*/
 int main() {
   int a, b, c;
   // this will be ARR
-  _Ptr<int> ap;
+  _Ptr<int> ap = NULL;
   // this will be WILD
   int *bp;
   // this will be _Ptr
-  _Ptr<int> cp;
+  _Ptr<int> cp = NULL;
   // this will be wild
   char *ap1;
   // this will be WILD
   int *bp1;
   // this will be _Ptr
-  _Ptr<int> cp1;
+  _Ptr<int> cp1 = NULL;
 
 
   //ap1 = &a;

tools/checked-c-convert/functests/ntarr/basic_inter_field.expected.c

@@ -16,8 +16,8 @@ _Ptr<int> func(_Ptr<int> ptr, _Nt_array_ptr<char> ntptr) {
 
 int main() {
   int a;
-  _Ptr<int> b;
-  _Nt_array_ptr<char> wil;
+  _Ptr<int> b = NULL;
+  _Nt_array_ptr<char> wil = NULL;
   a = strlen(wil);
   b = func(&a, wil);
 }

tools/checked-c-convert/functests/ntarr/basic_local.expected.c

@@ -6,11 +6,11 @@ int main() {
   // as NTArr
   // we use this as an argument
   // to string function.
-  _Nt_array_ptr<char> a;
+  _Nt_array_ptr<char> a = NULL;
   // c should be identified as 
   // ARR as we assign it the return value of
   // string function use it.
-  _Nt_array_ptr<char> c;
+  _Nt_array_ptr<char> c = NULL;
   // we will make this wild.
   int *d;
   int b;

tools/checked-c-convert/functests/ptr/basic_inter.expected.c

@@ -23,17 +23,17 @@ int func(_Ptr<int> ptr, int *iptr : itype(_Ptr<int> ) , int *wild) {
 int main() {
   int a, b, c;
   // this will be _Ptr
-  _Ptr<int> ap;
+  _Ptr<int> ap = NULL;
   // this will be WILD
   int *bp;
   // this will be _Ptr
-  _Ptr<int> cp;
+  _Ptr<int> cp = NULL;
   // this will be _Ptr
-  _Ptr<int> ap1;
+  _Ptr<int> ap1 = NULL;
   // this will be WILD
   int *bp1;
   // this will be _Ptr
-  _Ptr<int> cp1;
+  _Ptr<int> cp1 = NULL;
 
 
   ap1 = ap = &a;

tools/checked-c-convert/functests/ptr/basic_inter_field.expected.c

@@ -17,7 +17,7 @@ _Ptr<int> func(_Ptr<int> ptr, char *iwild : itype(_Ptr<char> ) ) {
 
 int main() {
   int a;
-  _Ptr<int> b;
+  _Ptr<int> b = NULL;
   char *wil;
   wil = 0xdeadbeef;
   b = func(&a, wil);

tools/checked-c-convert/functests/ptr/basic_local.expected.c

@@ -4,11 +4,11 @@
 int main() {
   // a has to identified
   // as _Ptr
-  _Ptr<int> a;
+  _Ptr<int> a = NULL;
   // c also 
   // should be identified as 
   // _Ptr
-  _Ptr<int> c;
+  _Ptr<int> c = NULL;
   int *d;
   int b;
   a = &b;

tools/checked-c-convert/functests/ptr/basic_return_itype.expected.c

@@ -26,17 +26,17 @@ static int *func(_Ptr<int> ptr, int *iptr : itype(_Ptr<int> ) , int *wild) : ity
 int main() {
   int a, b, c;
   // this will be _Ptr
-  _Ptr<int> ap;
+  _Ptr<int> ap = NULL;
   // this will be WILD
   int *bp;
   // this will be _Ptr
-  _Ptr<int> cp;
+  _Ptr<int> cp = NULL;
   // this will be _Ptr
-  _Ptr<int> ap1;
+  _Ptr<int> ap1 = NULL;
   // this will be WILD
   int *bp1;
   // this will be _Ptr
-  _Ptr<int> cp1;
+  _Ptr<int> cp1 = NULL;
 
 
   ap1 = ap = &a;