[Libreoffice-commits] core.git: 6 commits - connectivity/source filter/source sw/source vcl/unx
David Tardon
dtardon at redhat.com
Sat Apr 19 13:31:51 PDT 2014
connectivity/source/commontools/propertyids.cxx | 2 +-
filter/source/graphicfilter/egif/egif.cxx | 6 ++++++
filter/source/graphicfilter/epbm/epbm.cxx | 4 ++++
sw/source/filter/ww8/ww8par5.cxx | 15 +++++++++------
vcl/unx/generic/app/saldisp.cxx | 13 ++++++++++++-
5 files changed, 32 insertions(+), 8 deletions(-)
New commits:
commit f6de3b71410a0a8140d52fa4ce4255ff17ceaab3
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 19 19:41:02 2014 +0200
coverity#738628 Uninitialized scalar field
Change-Id: Ib14384f8212ae03bee4bb5ea9746681287323be4
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index c395974..536008c 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -76,8 +76,14 @@ public:
GIFWriter::GIFWriter(SvStream &rStream)
: m_rGIF(rStream)
, m_pAcc(NULL)
+ , nMinPercent(0)
+ , nMaxPercent(0)
+ , nLastPercent(0)
, nActX(0)
, nActY(0)
+ , nInterlaced(0)
+ , bStatus(false)
+ , bTransparent(false)
{
}
commit 60df2f153b5f6a06523082a1f07a670494b97c05
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 19 19:38:45 2014 +0200
coverity#738629 Uninitialized scalar field
Change-Id: Ic3bed7a422ba2073a32aefc6d44a7a4908fae8e0
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index 833dd03..c4de732 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -57,8 +57,12 @@ public:
PBMWriter::PBMWriter(SvStream &rPBM)
: m_rOStm(rPBM)
+ , mpOStmOldModus(0)
, mbStatus(sal_True)
+ , mnMode(0)
, mpAcc(NULL)
+ , mnWidth(0)
+ , mnHeight(0)
{
}
commit bb27930f0e53a422e63a2ac9ffa73823f4dfbc74
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 19 19:34:00 2014 +0200
coverity#738940 Uninitialized pointer field
Change-Id: I467c9ad530b376fd2a23110e4ff157ad03d23d57
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index d96fd20..d7231e0 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -238,10 +238,22 @@ bool SalDisplay::BestVisual( Display *pDisplay,
}
SalDisplay::SalDisplay( Display *display ) :
+ pXLib_( NULL ),
mpInputMethod( NULL ),
+ mpKbdExtension( NULL ),
+ mpFactory( NULL ),
pDisp_( display ),
m_nXDefaultScreen( 0 ),
+ nMaxRequestSize_( 0 ),
+ meServerVendor( vendor_unknown ),
+ bNumLockFromXS_( false ),
+ nNumLockIndex_( 0 ),
+ nNumLockMask_( 0 ),
+ nShiftKeySym_( 0 ),
+ nCtrlKeySym_( 0 ),
+ nMod1KeySym_( 0 ),
m_pWMAdaptor( NULL ),
+ m_bXinerama( false ),
m_bUseRandRWrapper( true ),
m_nLastUserEventTime( CurrentTime )
{
@@ -250,7 +262,6 @@ SalDisplay::SalDisplay( Display *display ) :
#endif
SalGenericData *pData = GetGenericData();
- pXLib_ = NULL;
DBG_ASSERT( ! pData->GetDisplay(), "Second SalDisplay created !!!\n" );
pData->SetDisplay( this );
commit caa5c53e7d8725b15725c4ad0f5073463693a45f
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 19 19:25:39 2014 +0200
coverity#982450 Explicit null dereferenced
Change-Id: I7097ce6ffc86038966a2f436300f49b51ff81977
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index fb9f2d3..5b3d635 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -181,7 +181,7 @@ namespace dbtools
case PROPERTY_ID_ACTIVE_CONNECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ACTIVE_CONNECTION() ); break; }
}
m_aPropertyMap[_nIndex] = pStr;
- return pStr;
+ return pStr ? OUString(pStr) : OUString();
}
}
commit 45a11701ffd18a1c616bbe7ebf36335d85db9c07
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 19 18:49:48 2014 +0200
make sure nEnd is after nBegin
Change-Id: Ic3cf41b21755c5f1e795ed3acb97ff83512b7613
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 2d83ee4..95b4b3b 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2529,7 +2529,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
sal_Int32 nEnd = sPart.indexOf(')');
if ((nBegin != -1) &&
- (nEnd != -1))
+ (nEnd != -1) && (nBegin < nEnd))
{
sRuby = sPart.copy(nBegin+1,nEnd-nBegin-1);
}
@@ -2542,7 +2542,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
}
nEnd = sPart.lastIndexOf(')');
}
- if ((nBegin != -1) && (nEnd != -1))
+ if ((nBegin != -1) && (nEnd != -1) && (nBegin < nEnd))
{
sText = sPart.copy(nBegin+1,nEnd-nBegin-1);
}
commit 7ea7ae1699d5b6c6a09d9227fd072868e58feb89
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 19 18:47:49 2014 +0200
coverity#1202818 improper use of negative value
Change-Id: I2b5fed2f9f9d6a4aa6a8087843fa1805c2d1ffe4
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 2542b8d..2d83ee4 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2533,12 +2533,15 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
{
sRuby = sPart.copy(nBegin+1,nEnd-nBegin-1);
}
- if (-1 ==
- (nBegin = sPart.indexOf(',',nEnd)))
+ if (-1 != nEnd)
{
- nBegin = sPart.indexOf(';',nEnd);
+ if (-1 ==
+ (nBegin = sPart.indexOf(',',nEnd)))
+ {
+ nBegin = sPart.indexOf(';',nEnd);
+ }
+ nEnd = sPart.lastIndexOf(')');
}
- nEnd = sPart.lastIndexOf(')');
if ((nBegin != -1) && (nEnd != -1))
{
sText = sPart.copy(nBegin+1,nEnd-nBegin-1);
More information about the Libreoffice-commits
mailing list