From d1ba919e39d24692e7b067d21be6111b242347ca Mon Sep 17 00:00:00 2001
From: orbitcowboy <ettl.martin78@gmail.com>
Date: Mon, 31 Aug 2015 11:59:57 +0200
Subject: [PATCH] Improved testing of std.cfg regarding uninitialized
 variables.

---
 cfg/std.cfg      |  6 +++---
 test/cfg/std.c   | 28 ++++++++++++++++++++++++++++
 test/cfg/std.cpp | 28 ++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index f69a7d9a3..f9f07a78e 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -1033,7 +1033,7 @@
     </arg>
   </function>
   <!-- size_t fread(void *ptr, size_t size, size_t nobj, FILE *stream); -->
-  <function name="fread">
+  <function name="fread,std::fread">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -1052,14 +1052,14 @@
     </arg>
   </function>
   <!-- void free(void *block); -->
-  <function name="free">
+  <function name="free,std::free">
     <noreturn>false</noreturn>
     <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
   <!-- FILE *freopen(const char *filename, const char *mode, FILE *stream); -->
-  <function name="freopen">
+  <function name="freopen,std::freopen">
     <noreturn>false</noreturn>
     <arg nr="1">
       <not-uninit/>
diff --git a/test/cfg/std.c b/test/cfg/std.c
index 2b703f7f9..097d91263 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -1296,6 +1296,34 @@ void uninitvar_fputws(void)
     (void)fputws(string,stream);
 }
 
+void uninitvar_fread(void)
+{
+    void *ptr;
+    size_t size;
+    size_t nobj;
+    FILE *stream;
+    // cppcheck-suppress uninitvar
+    (void)fread(ptr,size,nobj,stream);
+}
+
+void uninitvar_free(void)
+{
+    // cppcheck-suppress unassignedVariable
+    void *block;
+    // cppcheck-suppress uninitvar
+    free(block);
+}
+
+void uninitvar_freopen(void)
+{
+    char *filename;
+    char *mode;
+    FILE *stream;
+    // cppcheck-suppress uninitvar
+    FILE * p = freopen(filename,mode,stream);
+    free(p);
+}
+
 void ignoreretrn(void)
 {
     char szNumbers[] = "2001 60c0c0 -1101110100110100100000 0x6fffff";
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 9d15ec8be..cbbaed3f3 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -818,3 +818,31 @@ void uninitvar_fputws(void)
     // cppcheck-suppress uninitvar
     (void)std::fputws(string,stream);
 }
+
+void uninitvar_fread(void)
+{
+    void *ptr;
+    size_t size;
+    size_t nobj;
+    FILE *stream;
+    // cppcheck-suppress uninitvar
+    (void)std::fread(ptr,size,nobj,stream);
+}
+
+void uninitvar_free(void)
+{
+    // cppcheck-suppress unassignedVariable
+    void *block;
+    // cppcheck-suppress uninitvar
+    std::free(block);
+}
+
+void uninitvar_freopen(void)
+{
+    char *filename;
+    char *mode;
+    FILE *stream;
+    // cppcheck-suppress uninitvar
+    FILE * p = std::freopen(filename,mode,stream);
+    free(p);
+}