[Libreoffice-commits] core.git: 17 commits - chart2/source cui/source extensions/source i18npool/source lotuswordpro/source registry/source sot/source svtools/source svx/source sw/source tools/source vcl/generic vcl/source writerfilter/source
Caolán McNamara
caolanm at redhat.com
Sat Nov 1 14:02:57 PDT 2014
chart2/source/controller/main/DrawCommandDispatch.cxx | 2 -
cui/source/customize/cfg.cxx | 6 ++-
extensions/source/scanner/sane.cxx | 2 -
i18npool/source/calendar/calendar_gregorian.cxx | 2 +
lotuswordpro/source/filter/lwptools.cxx | 3 +
registry/source/reflread.cxx | 23 ++++++++---
sot/source/sdstor/ucbstorage.cxx | 7 +++
svtools/source/brwbox/brwbox1.cxx | 6 +--
svtools/source/brwbox/datwin.cxx | 13 ++----
svx/source/table/tablecontroller.cxx | 2 -
sw/source/core/doc/htmltbl.cxx | 11 ++++-
sw/source/uibase/dbui/mailmergehelper.cxx | 2 -
tools/source/generic/fract.cxx | 1
vcl/generic/fontmanager/fontconfig.cxx | 2 -
vcl/generic/glyphs/gcach_ftyp.cxx | 9 +---
vcl/source/control/combobox.cxx | 2 -
vcl/source/outdev/map.cxx | 5 ++
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 29 +++++++++------
18 files changed, 79 insertions(+), 48 deletions(-)
New commits:
commit 6fed9d0b1fc95fcea0de1a5faec2b4d5647be58a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 20:47:57 2014 +0000
coverity#1241199 Unchecked dynamic_cast
Change-Id: Id6bbd9d6922ee6fda7e9eb0945c27ed5a902d05b
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 3ef0370..f02ae22 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -699,7 +699,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
for( nSpanInfoRow = nPropSrcRow - 1; nSpanInfoRow >= 0; --nSpanInfoRow )
{
CellRef xMergeInfoCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nCol, nSpanInfoRow ).get() ) );
- if( !xMergeInfoCell->isMerged() )
+ if (xMergeInfoCell.is() && !xMergeInfoCell->isMerged())
{
nColSpan = xMergeInfoCell->getColumnSpan();
nRowSpan = xMergeInfoCell->getRowSpan();
commit 8f69c7a11bf31f7134caf4e03fbcd4c6ef86382d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 20:46:35 2014 +0000
coverity#1213373 Use of untrusted scalar value
Change-Id: Ia5cafdde1171f81ea7387e073026a2e860d36544
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 3f0a994..f8a5e8f 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -72,7 +72,13 @@ public:
inline sal_uInt16 readUINT16(sal_uInt32 index) const
{
- return ((m_pBuffer[index] << 8) | (m_pBuffer[index+1] << 0));
+ //This is untainted data which comes from a controlled source
+ //so, using a byte-swapping pattern which coverity doesn't
+ //detect as such
+ //http://security.coverity.com/blog/2014/Apr/on-detecting-heartbleed-with-static-analysis.html
+ sal_uInt32 v = m_pBuffer[index]; v <<= 8;
+ v |= m_pBuffer[index+1];
+ return v;
}
inline sal_Int32 readINT32(sal_uInt32 index) const
@@ -87,12 +93,15 @@ public:
inline sal_uInt32 readUINT32(sal_uInt32 index) const
{
- return (
- (m_pBuffer[index] << 24) |
- (m_pBuffer[index+1] << 16) |
- (m_pBuffer[index+2] << 8) |
- (m_pBuffer[index+3] << 0)
- );
+ //This is untainted data which comes from a controlled source
+ //so, using a byte-swapping pattern which coverity doesn't
+ //detect as such
+ //http://security.coverity.com/blog/2014/Apr/on-detecting-heartbleed-with-static-analysis.html
+ sal_uInt32 v = m_pBuffer[index]; v <<= 8;
+ v |= m_pBuffer[index+1]; v <<= 8;
+ v |= m_pBuffer[index+2]; v <<= 8;
+ v |= m_pBuffer[index+3];
+ return v;
}
inline sal_Int64 readINT64(sal_uInt32 index) const
commit 78e670b3055f92740402803174d61d058effb5d7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 20:38:57 2014 +0000
coverity#1078538 Division or modulo by zero
Change-Id: I0ae8d51a569c2a63f5fb390e66fdbde4a8e8b5d5
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index b788405..63a877f 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -1455,9 +1455,14 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv
}
sal_uLong nAbsTabWidthL = nAbsTabWidth;
- nRelTabWidth =
- ( nRelAvail ? (sal_uInt16)((nAbsTabWidthL * nRelAvail) / nAbsAvail)
- : nAbsTabWidth );
+ if (nRelAvail)
+ {
+ if (nAbsAvail == 0)
+ throw o3tl::divide_by_zero();
+ nRelTabWidth = (sal_uInt16)((nAbsTabWidthL * nRelAvail) / nAbsAvail);
+ }
+ else
+ nRelTabWidth = nAbsTabWidth;
double nW = nAbsTabWidth - nMin;
double nD = (nMax==nMin ? 1 : nMax-nMin);
sal_uInt16 nAbs = 0, nRel = 0;
commit 2149e924cbc32c370128c5f87a4f55c50c99e6bd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 20:37:30 2014 +0000
coverity#1000600 Division or modulo by float zero
Change-Id: If39679b54ef1bb0a7af794c2f7a6186ebd69c2e0
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index f4bc4dd..06ed55e 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -741,20 +741,27 @@ void DomainMapperTableManager::endOfRowAction()
sal_Int16 nLastRelPos = 0;
sal_uInt32 nBorderGridIndex = m_nGridBefore;
- ::std::vector< sal_Int32 >::const_iterator aSpansIter = pCurrentSpans->begin( );
- for( sal_uInt32 nBorder = 0; nBorder < m_nCell.back( ) - 1; ++nBorder )
+ size_t nWidthsBound = m_nCell.back( ) - 1;
+ if (nWidthsBound)
{
- double fGridWidth = 0.;
- for ( sal_Int32 nGridCount = *aSpansIter; nGridCount > 0; --nGridCount )
- fGridWidth += (*pTableGrid.get())[nBorderGridIndex++];
+ if (nFullWidthRelative == 0)
+ throw std::range_error("divide by zero");
- sal_Int16 nRelPos =
- sal::static_int_cast< sal_Int16 >((fGridWidth * 10000) / nFullWidthRelative);
+ ::std::vector< sal_Int32 >::const_iterator aSpansIter = pCurrentSpans->begin( );
+ for( sal_uInt32 nBorder = 0; nBorder < nWidthsBound; ++nBorder )
+ {
+ double fGridWidth = 0.;
+ for ( sal_Int32 nGridCount = *aSpansIter; nGridCount > 0; --nGridCount )
+ fGridWidth += (*pTableGrid.get())[nBorderGridIndex++];
- pSeparators[nBorder].Position = nRelPos + nLastRelPos;
- pSeparators[nBorder].IsVisible = sal_True;
- nLastRelPos = nLastRelPos + nRelPos;
- ++aSpansIter;
+ sal_Int16 nRelPos =
+ sal::static_int_cast< sal_Int16 >((fGridWidth * 10000) / nFullWidthRelative);
+
+ pSeparators[nBorder].Position = nRelPos + nLastRelPos;
+ pSeparators[nBorder].IsVisible = sal_True;
+ nLastRelPos = nLastRelPos + nRelPos;
+ ++aSpansIter;
+ }
}
TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
commit 169bc7c6c608215cf3805b84d617892c8bf487f4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 20:34:31 2014 +0000
coverity#735654 Division or modulo by zero
Change-Id: I9ab09d65ba7587230de320e22a79e9c7224f4ade
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index b69e9fd..329e48a 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1108,7 +1108,7 @@ void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines
if ( !IsDropDownBox() )
{
Size aOutSz = mpImplLB->GetMainWindow().GetOutputSizePixel();
- rnCols = (sal_uInt16)(aOutSz.Width()/nCharWidth);
+ rnCols = (nCharWidth > 0) ? (sal_uInt16)(aOutSz.Width()/nCharWidth) : 1;
rnLines = (sal_uInt16)(aOutSz.Height()/mpImplLB->GetEntryHeight());
}
else
commit 454b5d5a6d795b6b8bf5570c1cef030587e58277
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 20:30:33 2014 +0000
coverity#704564 Unchecked dynamic_cast
Change-Id: Ife93dd20c08bf2a30298384099cd36592091c336
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 77fd393..af43e75 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -474,7 +474,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
basegfx::B2DPolygon aPoly;
aPoly.append( basegfx::B2DPoint( aStart.X(), nYMiddle ) );
aPoly.append( basegfx::B2DPoint( aEnd.X(), nYMiddle ) );
- ( dynamic_cast< SdrPathObj* >( pObj ) )->SetPathPoly( basegfx::B2DPolyPolygon( aPoly ) );
+ dynamic_cast<SdrPathObj&>(*pObj).SetPathPoly(basegfx::B2DPolyPolygon(aPoly));
SfxItemSet aSet( pDrawModelWrapper->GetItemPool() );
setLineEnds( aSet );
pObj->SetMergedItemSet( aSet );
commit da2f4b132da0dee83e4d9b5c0e2eca653d5be83d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 20:28:37 2014 +0000
coverity#703954 Unchecked return value
Change-Id: Ifc8a4c2a3f22fc12b620a3bd0dd8ace57a99629c
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 672221d..4c52fbe 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -583,7 +583,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
}
}
if( ( nOption = GetOptionByName( "resolution" ) ) != -1 )
- GetOptionValue( nOption, fResl );
+ (void)GetOptionValue( nOption, fResl );
sal_uInt8* pBuffer = NULL;
commit da5c8e2821d7a772793deeecf8a27ab02ae14a4f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 16:21:14 2014 +0000
coverity#735646 Division or modulo by zero
Change-Id: I0567cfbf73b99f11649a08c73ea67d692691053c
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 81c6409..798c167 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -351,7 +351,7 @@ void SwAddressPreview::Paint(const Rectangle&)
void SwAddressPreview::MouseButtonDown( const MouseEvent& rMEvt )
{
Window::MouseButtonDown(rMEvt);
- if(rMEvt.IsLeft() && ( pImpl->nRows || pImpl->nColumns))
+ if (rMEvt.IsLeft() && pImpl->nRows && pImpl->nColumns)
{
//determine the selected address
const Point& rMousePos = rMEvt.GetPosPixel();
commit b59196e1d7843367a80fb67288949eb4a6c4c463
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 16:18:27 2014 +0000
coverity#1247614 Unchecked return value
Change-Id: I658a7f6c8410cfa38512bb45651e5332fbde3194
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index b5c12cd..6f66c25 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2835,7 +2835,12 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const OUString& rEleName, StreamMode
}
pElement->m_xStream->PrepareCachedForReopen( nMode );
- pElement->m_xStream->Init();
+ bool bInited = pElement->m_xStream->Init();
+ if (!bInited)
+ {
+ SetError( ( nMode & STREAM_WRITE ) ? SVSTREAM_CANNOT_MAKE : SVSTREAM_FILE_NOT_FOUND );
+ return NULL;
+ }
pElement->m_bIsStorage = true;
return pElement->m_xStream->CreateStorage(); // can only be created in transacted mode
commit 0f6e4e7fd95e23927d4aac45153a15872b32f5fd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 16:14:52 2014 +0000
coverity#1250404 Operands don't affect result
trying to auto-ignore this one, so don't touch it manually in the UI so I can
experiment if this syntax will correctly auto-triage in all coverity instances
Change-Id: I4ae42a6828041f40c6ab8cb3cfc631c8dd38e8c8
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 7102d5a..f3f7d23 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -63,6 +63,7 @@ Fraction::Fraction( double dVal )
bool Fraction::HasOverflowValue()
{
+ //coverity[constant_expression_result]
return value.numerator() < std::numeric_limits<long>::min() ||
value.numerator() > std::numeric_limits<long>::max() ||
value.denominator() < std::numeric_limits<long>::min() ||
commit eed1ea797acfe69af587adbefe60316ba6ba127f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 15:55:14 2014 +0000
coverity#1250406 Division or modulo by float zero
and
coverity#1250407 Division or modulo by float zero
coverity#1250408 Division or modulo by float zero
Change-Id: I77e4483356f7c0b287a29637cf6b958ee665ffec
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index caf2b41..51bfecb 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -19,6 +19,7 @@
#include <svtools/brwbox.hxx>
#include <svtools/brwhead.hxx>
+#include <o3tl/numeric.hxx>
#include "datwin.hxx"
#include <tools/debug.hxx>
#include <tools/stream.hxx>
@@ -2418,7 +2419,6 @@ long BrowseBox::GetTitleHeight() const
return nTitleLines ? nTitleLines * nHeight + 4 : 0;
}
-
long BrowseBox::CalcReverseZoom(long nVal)
{
if (IsZoom())
@@ -2426,6 +2426,8 @@ long BrowseBox::CalcReverseZoom(long nVal)
const Fraction& rZoom = GetZoom();
double n = (double)nVal;
n *= (double)rZoom.GetDenominator();
+ if (!rZoom.GetNumerator())
+ throw o3tl::divide_by_zero();
n /= (double)rZoom.GetNumerator();
nVal = n>0 ? (long)(n + 0.5) : -(long)(-n + 0.5);
}
@@ -2445,8 +2447,6 @@ void BrowseBox::CursorMoved()
);
}
-
-
void BrowseBox::LoseFocus()
{
OSL_TRACE( "BrowseBox: %p->LoseFocus", this );
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 91bff8b..b2fea46 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -19,9 +19,8 @@
#include "datwin.hxx"
-
+#include <o3tl/numeric.hxx>
#include <vcl/svapp.hxx>
-
#include <vcl/help.hxx>
#include <vcl/image.hxx>
#include <vcl/settings.hxx>
@@ -101,8 +100,6 @@ void ButtonFrame::Draw( OutputDevice& rDev )
rDev.SetFillColor( aOldFillColor );
}
-
-
BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage,
const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom )
: _nId( nItemId ),
@@ -114,6 +111,8 @@ BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage,
double n = (double)_nWidth;
n *= (double)rCurrentZoom.GetDenominator();
n /= (double)rCurrentZoom.GetNumerator();
+ if (!rCurrentZoom.GetNumerator())
+ throw o3tl::divide_by_zero();
_nOriginalWidth = n>0 ? (long)(n+0.5) : -(long)(-n+0.5);
}
@@ -121,19 +120,17 @@ BrowserColumn::~BrowserColumn()
{
}
-
-
void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom)
{
_nWidth = nNewWidthPixel;
double n = (double)_nWidth;
n *= (double)rCurrentZoom.GetDenominator();
+ if (!rCurrentZoom.GetNumerator())
+ throw o3tl::divide_by_zero();
n /= (double)rCurrentZoom.GetNumerator();
_nOriginalWidth = n>0 ? (long)(n+0.5) : -(long)(-n+0.5);
}
-
-
void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, bool bCurs )
{
if ( _nId == 0 )
commit 445ac42cc2f2f759a43d97198039b980026ed70e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 15:52:06 2014 +0000
coverity#1250405 Division or modulo by float zero
Change-Id: Ifbb7ab559d161fdc8b6838ea34a4519286423997
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 125b8e3..c646f8a 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -18,7 +18,7 @@
*/
#include <limits.h>
-
+#include <o3tl/numeric.hxx>
#include <tools/bigint.hxx>
#include <vcl/virdev.hxx>
@@ -261,6 +261,9 @@ static void ImplCalcMapResolution( const MapMode& rMapMode,
}
else
{
+ if (!aScaleX.GetNumerator() || ! aScaleY.GetNumerator())
+ throw o3tl::divide_by_zero();
+
rMapRes.mfOffsetX *= aScaleX.GetDenominator();
rMapRes.mfOffsetX /= aScaleX.GetNumerator();
rMapRes.mfOffsetX += aOrigin.X();
commit 4e4b4ce3d3cc2efa14aa837fd98a53a6ff5c87fe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 15:49:36 2014 +0000
coverity#1250439 Structurally dead code
Change-Id: Ib0e8fefb154417dde95bc70765ad675a1824db44
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 6b1ce3e..2dc7c11 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1641,15 +1641,12 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
pScriptTable += 4;
sal_uInt16 nLangsysOffset = 0;
- for( sal_uInt16 nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex )
+ if (nCntLangSystem != 0)
{
- const sal_uInt16 nOffset= GetUShort( pScriptTable+4 );
- pScriptTable += 6;
- nLangsysOffset = nOffset;
- break;
+ nLangsysOffset = GetUShort( pScriptTable+4 );
}
- if( (nDefaultLangsysOfs != 0) && (nDefaultLangsysOfs != nLangsysOffset) )
+ if (nDefaultLangsysOfs != 0 && nDefaultLangsysOfs != nLangsysOffset)
{
const FT_Byte* pLangSys = pGsubBase + nOfsScriptList + nOfsScriptTable + nDefaultLangsysOfs;
const sal_uInt16 nReqFeatureIdx = GetUShort( pLangSys+2 );
commit c79c3e3ed4489e424f378d603e9247b2f8312733
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 14:34:33 2014 +0000
coverity#1250409 Explicit null dereferenced
Change-Id: Ib32e7c9eb979b9d6ab60d81423292be5fac87a54
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index f55e115..8203914 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -343,13 +343,15 @@ generateCustomMenuURL(
OUString url(CUSTOM_MENU_STR );
url += OUString::number( suffix );
+ if (!entries)
+ return url;
+
// now check is there is an already existing entry with this url
SvxEntries::const_iterator iter = entries->begin();
- SvxConfigEntry* pEntry;
while ( iter != entries->end() )
{
- pEntry = *iter;
+ SvxConfigEntry* pEntry = *iter;
if ( url.equals( pEntry->GetCommand() ) )
{
commit 59fc4ae4bd209ebe33872a8610a0b992d68d662b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 14:30:40 2014 +0000
coverity#736401 Resource leak
Change-Id: Ice79f5618bb22d2d22d5033a52732da383ff5643
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index cd61c4d..7015651 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -826,7 +826,10 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
default:
{
if ((cSymbol>='A' && cSymbol<='Z') || (cSymbol>='a' && cSymbol<='z') )
+ {
+ delete pTimeStyle;
return NULL;
+ }
else//TEXT
{
sal_Unicode buffer[1024];
commit e80d263be87c6bc115a00859507237ea70fb9717
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 14:29:27 2014 +0000
coverity#735338 Unchecked return value
Change-Id: If19a61c82f1cf723c8e78e8d27461a543ddbfd40
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 72ed0e2..1a9dd39 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -1211,7 +1211,7 @@ ImplFontOptions* PrintFontManager::getFontOptions(
FC_AUTOHINT, 0, &autohint);
FcResult eHinting = FcPatternGetBool(pResult,
FC_HINTING, 0, &hinting);
- /*FcResult eHintStyle =*/ FcPatternGetInteger(pResult,
+ (void) FcPatternGetInteger(pResult,
FC_HINT_STYLE, 0, &hintstyle);
pOptions = new FontConfigFontOptions;
commit cbe2c9bdbb5d00bb43121b093a3690da421c6988
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 1 14:28:08 2014 +0000
coverity#707920 Uninitialized scalar field
and
coverity#1250438 Uninitialized scalar field
Change-Id: I029e033feb0805a0f744c68d43602217f9f01f6e
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index ee90844..df713c1 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -141,6 +141,8 @@ Calendar_gregorian::init(const Era *_eraArray)
{
cCalendar = "com.sun.star.i18n.Calendar_gregorian";
+ fieldSet = 0;
+
// #i102356# With icu::Calendar::createInstance(UErrorCode) in a Thai
// th_TH system locale we accidentally used a Buddhist calendar. Though
// the ICU documentation says that should be the case only for
More information about the Libreoffice-commits
mailing list