From 29d401ff38236d1e7090e15893d6d1e0ae2517f7 Mon Sep 17 00:00:00 2001
From: Alexander Mai <amai@users.sf.net>
Date: Thu, 6 Mar 2014 16:31:31 +0100
Subject: [PATCH] Fixed #3098 (false negative: unitialized variable being
 passed to strcoll())

---
 cfg/std.cfg            | 1 +
 test/testuninitvar.cpp | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index b52971780..3b48d78e3 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -38,6 +38,7 @@
 
   <function name="strcat">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg> <arg nr="2"><not-null/><not-uninit/></arg> </function>
   <function name="strchr">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg> </function>
+  <function name="strcoll"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg> <arg nr="2"><not-null/><not-uninit/></arg> </function>
   <function name="strcpy">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/></arg> <arg nr="2"><not-null/><not-uninit/></arg> </function>
   <function name="strcmp">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg> <arg nr="2"><not-null/><not-uninit/></arg> </function>
   <function name="strdup">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg> </function>
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index 991ca6123..4d9533344 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -74,12 +74,8 @@ private:
         errout.str("");
 
         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));
+        LOAD_LIB("std.cfg");
+        settings.library = _lib;
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);