From 0c475554238d16e47cee29d68e9eb6b4f3f1d994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 26 Jan 2014 16:19:49 +0100
Subject: [PATCH] CheckNullPointer: use library instead of hard coded info

---
 cfg/std.cfg              | 10 +++++-----
 lib/checknullpointer.cpp |  8 --------
 test/testuninitvar.cpp   |  6 ++++++
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index 2d9135c3e..6c01f439e 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -30,11 +30,11 @@
   <function name="ispunct"> <noreturn>false</noreturn> <leak-ignore/>  <arg nr="1"><valid>0-255</valid></arg> </function>
   <function name="isspace"> <noreturn>false</noreturn> <leak-ignore/>  <arg nr="1"><valid>0-255</valid></arg> </function>
 
-  <function name="memchr">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
-  <function name="memcmp">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
-  <function name="memcpy">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
-  <function name="memmove"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
-  <function name="memset">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
+  <function name="memchr">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
+  <function name="memcmp">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg> <arg nr="2"><not-null/><not-uninit/></arg> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
+  <function name="memcpy">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/></arg> <arg nr="2"><not-null/><not-uninit/></arg> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
+  <function name="memmove"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/></arg> <arg nr="2"><not-null/><not-uninit/></arg> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
+  <function name="memset">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/></arg> <arg nr="3"><not-bool/><valid>0-</valid></arg> </function>
 
   <function name="strcat">  <noreturn>false</noreturn> <leak-ignore/> </function>
   <function name="strchr">  <noreturn>false</noreturn> <leak-ignore/> </function>
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
index 18b33c7c4..4ddda7375 100644
--- a/lib/checknullpointer.cpp
+++ b/lib/checknullpointer.cpp
@@ -66,8 +66,6 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
         functionNames1_all.insert("wcstoll");
         functionNames1_all.insert("wcstoull");
         // cstring
-        functionNames1_all.insert("memchr");
-        functionNames1_all.insert("memcmp");
         functionNames1_all.insert("strcat");
         functionNames1_all.insert("strncat");
         functionNames1_all.insert("strcoll");
@@ -135,9 +133,6 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
         functionNames1_all.insert("ctime");
         functionNames1_all.insert("mktime");
 
-        functionNames1_nullptr.insert("memcpy");
-        functionNames1_nullptr.insert("memmove");
-        functionNames1_nullptr.insert("memset");
         functionNames1_nullptr.insert("strcpy");
         functionNames1_nullptr.insert("sprintf");
         functionNames1_nullptr.insert("vsprintf");
@@ -168,9 +163,6 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
     if (functionNames2_all.empty()) {
         functionNames2_all.insert("mbstowcs");
         functionNames2_all.insert("wcstombs");
-        functionNames2_all.insert("memcmp");
-        functionNames2_all.insert("memcpy");
-        functionNames2_all.insert("memmove");
         functionNames2_all.insert("strcat");
         functionNames2_all.insert("strncat");
         functionNames2_all.insert("strcmp");
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index 3e1c3f00e..db4c1dd05 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -75,6 +75,12 @@ private:
 
         Settings settings;
 
+        const char cfg[] = "<?xml version=\"1.0\"?>"
+                           "<def>"
+                           "  <function name=\"memcpy\"> <arg nr=\"1\"><not-null/></arg> </function>"
+                           "</def>";
+        settings.library.loadxmldata(cfg,sizeof(cfg));
+
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);