3 files changed, 14 insertions, 0 deletions
diff --git a/clang/lib/Analysis/GRExprEngineExperimentalChecks.cpp b/clang/lib/Analysis/GRExprEngineExperimentalChecks.cpp
index e50dbeba688..75f97898ff1 100644
--- a/clang/lib/Analysis/GRExprEngineExperimentalChecks.cpp
+++ b/clang/lib/Analysis/GRExprEngineExperimentalChecks.cpp
@@ -19,5 +19,6 @@ using namespace clang;
 
 void clang::RegisterExperimentalChecks(GRExprEngine &Eng) {
   RegisterPthreadLockChecker(Eng);  
+  RegisterMallocChecker(Eng);
 }
 
diff --git a/clang/lib/Analysis/GRExprEngineExperimentalChecks.h b/clang/lib/Analysis/GRExprEngineExperimentalChecks.h
index bb9af3a416f..9a9da32e556 100644
--- a/clang/lib/Analysis/GRExprEngineExperimentalChecks.h
+++ b/clang/lib/Analysis/GRExprEngineExperimentalChecks.h
@@ -20,6 +20,7 @@ namespace clang {
 class GRExprEngine;
 
 void RegisterPthreadLockChecker(GRExprEngine &Eng);
+void RegisterMallocChecker(GRExprEngine &Eng);
 
 } // end clang namespace
 #endif
diff --git a/clang/lib/Analysis/MallocChecker.cpp b/clang/lib/Analysis/MallocChecker.cpp
index cbc115f9dae..f007aa65da1 100644
--- a/clang/lib/Analysis/MallocChecker.cpp
+++ b/clang/lib/Analysis/MallocChecker.cpp
@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "GRExprEngineExperimentalChecks.h"
 #include "clang/Analysis/PathSensitive/CheckerVisitor.h"
 #include "clang/Analysis/PathSensitive/GRState.h"
 #include "clang/Analysis/PathSensitive/GRStateTrait.h"
@@ -33,8 +34,11 @@ class VISIBILITY_HIDDEN MallocChecker : public CheckerVisitor<MallocChecker> {
   IdentifierInfo *II_free;
 
 public:
+  MallocChecker() : BT_DoubleFree(0) {}
   static void *getTag();
   void PostVisitCallExpr(CheckerContext &C, const CallExpr *CE);
+  void EvalDeadSymbols(CheckerContext &C,const Stmt *S,SymbolReaper &SymReaper);
+private:
   void MallocMem(CheckerContext &C, const CallExpr *CE);
   void FreeMem(CheckerContext &C, const CallExpr *CE);
 };
@@ -59,6 +63,10 @@ namespace clang {
   };
 }
 
+void clang::RegisterMallocChecker(GRExprEngine &Eng) {
+  Eng.registerCheck(new MallocChecker());
+}
+
 void *MallocChecker::getTag() {
   static int x;
   return &x;
@@ -124,3 +132,7 @@ void MallocChecker::FreeMem(CheckerContext &C, const CallExpr *CE) {
   const GRState *FreedState = state->set<RegionState>(Sym, Released);
   C.addTransition(C.GenerateNode(CE, FreedState));
 }
+
+void MallocChecker::EvalDeadSymbols(CheckerContext &C, const Stmt *S,
+                                    SymbolReaper &SymReaper) {
+}