filter/source/config/cache/filtercache.cxx | 2 +- oox/source/export/shapes.cxx | 2 +- sal/rtl/ustring.cxx | 2 -- sfx2/source/doc/objstor.cxx | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 67dbf154a2780f42614e668416e99c463857c952 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Feb 7 14:10:19 2015 +0000 coverity#440978 Dereference before null check Change-Id: I9a58c59932fbe164a05f5088881a11f4f2708cee diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 4c332ae..d763e69 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1331,7 +1331,7 @@ bool SfxObjectShell::SaveTo_Impl } // TODO/LATER: error handling - if( rMedium.GetErrorCode() || !pMedium || pMedium->GetErrorCode() || GetErrorCode() ) + if( rMedium.GetErrorCode() || pMedium->GetErrorCode() || GetErrorCode() ) return false; AddLog( OUString( OSL_LOG_PREFIX "Locking" ) ); commit ac6af669f47655a127eff3d3268437e556d47b46 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Feb 7 14:07:15 2015 +0000 coverity#1267690 Uncaught exception Change-Id: I38edf3f78d73c004cb85edd84a22dddc9d870f37 diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index eb802f0..18115e4 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1637,7 +1637,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: if (!(aVal >>= xItem) || !xItem.is()) { OUString sMsg("found corrupted item \"" + sItem + "\"."); - throw css::uno::Exception(sMsg, css::uno::Reference< css::uno::XInterface >()); + throw css::uno::RuntimeException(sMsg, css::uno::Reference< css::uno::XInterface >()); } #ifdef WORKAROUND_EXCEPTION_PROBLEM } commit d3aa72da441a5eebdc06107b35222b7b126b9a13 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Feb 7 14:02:30 2015 +0000 coverity#1268297 Logically dead code Change-Id: Ie9a37e7eb837abf0d2783a9a0f8c2b33a6772d33 diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx index 7a342df..cd42e47 100644 --- a/sal/rtl/ustring.cxx +++ b/sal/rtl/ustring.cxx @@ -949,8 +949,6 @@ void SAL_CALL rtl_uString_internConvert( rtl_uString ** newStr, if ( len < 256 ) { // try various optimisations sal_Int32 ulen; - if ( len < 0 ) - len = strlen( str ); if ( eTextEncoding == RTL_TEXTENCODING_ASCII_US ) { int i; commit f28d59c33513598728d72eacfde77e521e7ec056 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Feb 7 13:59:26 2015 +0000 coverity#1268301 Dereference null return value Change-Id: I487009503866b6910049824efab987066dd72023 diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 64a0e3f..e008262 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -446,7 +446,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape ) else if( bHasHandles ) bCustGeom = true; - if( bCustGeom ) + if (bCustGeom && pShape) { basegfx::B2DPolyPolygon aB2DPolyPolygon = pShape->GetLineGeometry(true); tools::PolyPolygon aPolyPolygon;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits