From e00f50b850cc96ff07cbd19656eb6e7e77bab289 Mon Sep 17 00:00:00 2001
From: Martin Ettl <ettl.martin78@googlemail.com>
Date: Fri, 21 Mar 2014 17:36:48 +0100
Subject: [PATCH] Fixed #5597 and added abort() support to stdcfg.

---
 cfg/std.cfg              | 1 +
 test/testnullpointer.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index e3f1381fe..392cedc78 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <def>
   <function name="exit"><noreturn>true</noreturn></function>
+  <function name="abort"><noreturn>true</noreturn></function>
   <memory>
     <dealloc>free</dealloc>
 
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index 1e1ecf532..b47b6de3a 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -1379,7 +1379,7 @@ private:
             ASSERT_EQUALS("", errout.str());
 
             check(code, true);
-            ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:2]: (warning, inconclusive) Possible null pointer dereference: p - otherwise it is redundant to check it against null.\n", errout.str());
+            ASSERT_EQUALS("", errout.str());
         }
 
         check("void foo(char *p) {\n"