connectivity/source/parse/sqliterator.cxx | 5 +++-- sfx2/source/dialog/partwnd.cxx | 5 +++-- writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-)
New commits: commit 38e26f75854e299333a731343ba9d81bfb45272f Author: Caolán McNamara <[email protected]> Date: Thu Jan 23 17:00:30 2014 +0000 coverity#1158417 Uninitialized scalar field Change-Id: I120eb012151b799b84974222c08b02d0cb73975c diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index 342eb74..4536aac 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -57,8 +57,10 @@ struct HorizontallyMergedCell sal_Int32 m_nLastRow; sal_Int32 m_nLastCol; HorizontallyMergedCell(sal_Int32 nFirstRow, sal_Int32 nFirstCol) - : m_nFirstRow(nFirstRow), - m_nFirstCol(nFirstCol) + : m_nFirstRow(nFirstRow) + , m_nFirstCol(nFirstCol) + , m_nLastRow(0) + , m_nLastCol(0) { } }; commit c634df5815d68b58ec9a7a19272bfb4a4053e4e8 Author: Caolán McNamara <[email protected]> Date: Thu Jan 23 16:42:29 2014 +0000 coverity#440721 Dereference after null check Change-Id: I1a6d6f5d83f3b6c5f8d8d19b003f2e4f6976d6e9 diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index a0de0f5..63b1562 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -61,8 +61,9 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl // Create Window pWindow = new SfxPartDockWnd_Impl( pBindings, this, pParentWnd, WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK ); eChildAlignment = SFX_ALIGN_TOP; - if ( pInfo ) - pInfo->nFlags |= SFX_CHILDWIN_FORCEDOCK; + + assert(pInfo); + pInfo->nFlags |= SFX_CHILDWIN_FORCEDOCK; ((SfxDockingWindow*)pWindow)->SetFloatingSize( Size( 175, 175 ) ); pWindow->SetSizePixel( Size( 175, 175 ) ); commit 09c749cc5787be8d17ac5ddf0bc9aa0aead92d6b Author: Caolán McNamara <[email protected]> Date: Thu Jan 23 16:39:42 2014 +0000 coverity#440711 Explicit null dereferenced Change-Id: I794ac29dc81b1d42b959135277284de1f8c33ccf diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 06b07ca..ae9fff2 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1249,9 +1249,10 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele return false; } - if (! SQL_ISRULE(pWhereClause,where_clause)) { + if (!pWhereClause || !SQL_ISRULE(pWhereClause,where_clause)) + { // The WHERE clause is optional most of the time; which means it could be a "optional_where_clause". - OSL_ENSURE(SQL_ISRULE(pWhereClause,opt_where_clause),"OSQLParseTreeIterator: error in parse tree!"); + OSL_ENSURE(pWhereClause && SQL_ISRULE(pWhereClause,opt_where_clause),"OSQLParseTreeIterator: error in parse tree!"); return false; }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
