From d7e7a44ccd771f79736e8cf7de289eb6e30c0e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 9 May 2014 21:23:00 +0100
Subject: [PATCH] coverity#12093[81-94], etc. null pointer dereference

coverity seems to think that code execution can continue
after a coverity test fails, but it will effectively halt
and not trundle into the dereference of the tested-for-NULL
pointer, try a [+kill] on the fail method

Change-Id: I07c9a074b5681c367a31637c8af78d52a9c88d59
---
 external/cppunit/UnpackedTarball_cppunit.mk |  1 +
 external/cppunit/coverity.patch             | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 external/cppunit/coverity.patch

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk
index 5898a886005d..86dc77d4149d 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit))
 $(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
+	external/cppunit/coverity.patch \
 	external/cppunit/windows.patch \
 	external/cppunit/unix.patch \
 	external/cppunit/wundef.patch \
diff --git a/external/cppunit/coverity.patch b/external/cppunit/coverity.patch
new file mode 100644
index 000000000000..5e5e64d4c7eb
--- /dev/null
+++ b/external/cppunit/coverity.patch
@@ -0,0 +1,11 @@
+--- misc/cppunit-1.13.1/src/cppunit/Asserter.cpp
++++ misc/build/cppunit-1.13.1/src/cppunit/Asserter.cpp
+@@ -13,7 +13,7 @@
+   fail( Message( "assertion failed", message ), sourceLine );
+ }
+ 
+-
++// coverity[+kill]
+ void 
+ Asserter::fail( const Message &message, 
+                 const SourceLine &sourceLine )