[Libreoffice-commits] core.git: 2 commits - external/cppunit vcl/source

[Caolán McNamara]

 external/cppunit/UnpackedTarball_cppunit.mk |    1 +
 external/cppunit/coverity.patch             |   11 +++++++++++
 vcl/source/gdi/pngread.cxx                  |   19 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit a4f72bdea4bfccc4c8b6ef140953cc375bba7d6d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat May 10 12:53:36 2014 +0100

    coverity#708632 Uninitialized scalar field
    
    Change-Id: Iea0a0aae7ca4f975acc0d468ad3912c38d84d57e

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index c5009d8..04b46a6 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -175,7 +175,24 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
     mpTransTab      ( NULL ),
     mpScanCurrent   ( NULL ),
     mpColorTable    ( (sal_uInt8*) mpDefaultColorTable ),
-    mnPass ( 0 ),
+    mnChunkType     ( 0 ),
+    mnChunkLen      ( 0 ),
+    mnBPP           ( 0 ),
+    mnScansize      ( 0 ),
+    mnYpos          ( 0 ),
+    mnPass          ( 0 ),
+    mnXStart        ( 0 ),
+    mnXAdd          ( 0 ),
+    mnYAdd          ( 0 ),
+    mnTargetDepth   ( 0 ),
+    mnTransRed      ( 0 ),
+    mnTransGreen    ( 0 ),
+    mnTransBlue     ( 0 ),
+    mnPngDepth      ( 0 ),
+    mnColorType     ( 0 ),
+    mnCompressionType( 0 ),
+    mnFilterType    ( 0 ),
+    mnInterlaceType ( 0 ),
     mbTransparent( false ),
     mbAlphaChannel( false ),
     mbRGBTriple( false ),
commit d7e7a44ccd771f79736e8cf7de289eb6e30c0e23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 9 21:23:00 2014 +0100

    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

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk
index 5898a88..86dc77d 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 0000000..5e5e64d
--- /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 )