summaryrefslogtreecommitdiff
path: root/external/cppunit
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-05-09 21:23:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-05-10 13:02:57 +0100
commitd7e7a44ccd771f79736e8cf7de289eb6e30c0e23 (patch)
tree0d777c9a8799c8408ce692e4ed1f6c877fb97d9f /external/cppunit
parenta784cdbd38cb03d2881096e2540fccdaf8b6a24a (diff)
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
Diffstat (limited to 'external/cppunit')
-rw-r--r--external/cppunit/UnpackedTarball_cppunit.mk1
-rw-r--r--external/cppunit/coverity.patch11
2 files changed, 12 insertions, 0 deletions
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 )