[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 9 commits - cui/source external_deps.lst more_fonts/fonts more_fonts/prj sal/osl scp2/source sot/source svx/source sw/source vcl/unx xmloff/source xmlsecurity/source
Pedro Giffuni
pfg at apache.org
Tue Nov 24 08:09:07 PST 2015
cui/source/options/treeopt.cxx | 2 ++
external_deps.lst | 10 +++++-----
more_fonts/fonts/ttf_croscore/makefile.mk | 4 ++--
more_fonts/fonts/ttf_dejavu/makefile.mk | 6 +++---
more_fonts/prj/d.lst | 6 +++---
sal/osl/unx/file_url.cxx | 4 +++-
scp2/source/ooo/file_font_ooo.scp | 3 ---
sot/source/sdstor/stgdir.cxx | 2 ++
svx/source/sidebar/nbdtmg.cxx | 2 ++
sw/source/core/access/accpara.cxx | 3 ++-
vcl/unx/generic/dtrans/X11_selection.cxx | 4 ++--
xmloff/source/text/txtparai.cxx | 1 +
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2 +-
13 files changed, 28 insertions(+), 21 deletions(-)
New commits:
commit 84dc0bfe31601898c34355fe99ba6ad78efff8ed
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:43:34 2015 +0000
Update basic fonts:
Use new versions of the Google Croscore and DejaVu fonts.
The Croscore fonts do not carry NeuSymbol anymore but
that is not really an issue since we carry OpenSymbol.
diff --git a/external_deps.lst b/external_deps.lst
index 9c5ac38..2ed03df 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -234,14 +234,14 @@ if (SYSTEM_CURL != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (WITH_CATA_FONTS == YES)
- MD5 = 161462de16e2ca79873bc2b0d2e6c74c
- name = dejavu-fonts-ttf-2.34.tar.bz2
- URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.34/dejavu-fonts-ttf-2.34.tar.bz2/download
+ MD5 = 59eaca5acf5c7c8212e92778e3e01f32
+ name = dejavu-fonts-ttf-2.35.tar.bz2
+ URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.35/$(name)/download
# URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (WITH_CATA_FONTS==YES)
- MD5 = cfa8bec07bf5b6856dd20f0cb28b3929
- name = croscorefonts-1.23.0.tar.gz
+ MD5 = 3c90ac73fd13bd79684d9dc073840328
+ name = croscorefonts-1.31.0.tar.bz2
URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
diff --git a/more_fonts/fonts/ttf_croscore/makefile.mk b/more_fonts/fonts/ttf_croscore/makefile.mk
index 5e6a86b..1f36dc9 100644
--- a/more_fonts/fonts/ttf_croscore/makefile.mk
+++ b/more_fonts/fonts/ttf_croscore/makefile.mk
@@ -37,8 +37,8 @@ TARGET=ttf_croscore
# --- Files --------------------------------------------------------
-TARFILE_NAME=croscorefonts-1.23.0
-TARFILE_MD5=cfa8bec07bf5b6856dd20f0cb28b3929
+TARFILE_NAME=croscorefonts-1.31.0
+TARFILE_MD5=3c90ac73fd13bd79684d9dc073840328
PATCH_FILES=
diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk
index 1b8f596..970b84d 100644
--- a/more_fonts/fonts/ttf_dejavu/makefile.mk
+++ b/more_fonts/fonts/ttf_dejavu/makefile.mk
@@ -39,9 +39,9 @@ TARGET=ttf_dejavu
# --- Files --------------------------------------------------------
-TARFILE_NAME=dejavu-fonts-ttf-2.34
-TARFILE_MD5=161462de16e2ca79873bc2b0d2e6c74c
-TARFILE_ROOTDIR=dejavu-fonts-ttf-2.34
+TARFILE_NAME=dejavu-fonts-ttf-2.35
+TARFILE_MD5=59eaca5acf5c7c8212e92778e3e01f32
+TARFILE_ROOTDIR=dejavu-fonts-ttf-2.35
PATCH_FILES=
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 802156f..d33c4b5 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -1,8 +1,8 @@
mkdir: %COMMON_DEST%\pck%_EXT%
..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf
# TODO: replace explicit versions by wildcard when the build system learns to handle them
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
-..\%__SRC%\misc\build\croscorefonts-1.23.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index d9a860c..63da849 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -99,9 +99,6 @@ STD_FONT_FILE( gid_File_Fnt_Tinos_Bold, Tinos-Bold.ttf, Tinos Bold)
STD_FONT_FILE( gid_File_Fnt_Tinos_Italic, Tinos-Italic.ttf, Tinos Italic)
STD_FONT_FILE( gid_File_Fnt_Tinos_BoldItalic, Tinos-BoldItalic.ttf, Tinos Bold Italic)
-// Symbol Neu
-STD_FONT_FILE( gid_File_Fnt_SymbolNeu, SymbolNeu.ttf, Symbol Neu)
-
#endif // WNT
#endif // WITH_CATB_FONTS
commit 7fc36af9ba9d413f6cc7cbeecd8ac039bf9e3333
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:37:05 2015 +0000
Dereference after null check
CID: 982591
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 678156a..5e48b311 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -548,9 +548,9 @@ SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException
if( xcert != NULL )
certsList.push_back( xcert ) ;
}
+ SECKEY_DestroyPrivateKeyList( priKeyList ) ;
}
- SECKEY_DestroyPrivateKeyList( priKeyList ) ;
}
//secondly, we try to find certificate from registered private keys.
commit 76af02453fbad0f13927fdd1768117756a876205
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:35:01 2015 +0000
Uninitialized scalar field
CID: 708722
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 7560e50..a38171a 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -130,6 +130,7 @@ XMLCharContext::XMLCharContext(
SvXMLImportContext( rImp, nPrfx, rLName )
,m_nControl(nControl)
,m_nCount(0)
+ ,m_c(0)
{
}
commit 6062581a6a07b59e2283a8361815c0db9e7fb45b
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:33:04 2015 +0000
Resource leak
CID: 1229496
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index f426995..1d9b1f3 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -911,6 +911,8 @@ void StgDirStrm::SetupEntry (
SetupEntry( nRight, pUpper, nEntryCount, nDepth+1);
SetupEntry( nLeaf, pCur, nEntryCount, nDepth+1);
}
+ else
+ delete pCur;
}
}
commit 71657602fc3411275b4f9f1c68e9dea274de064e
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:31:03 2015 +0000
Use after Free
CID: 1158520
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 8a20897..1e8cd11 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3815,7 +3815,8 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
}
// else: this PaM is collapsed and doesn't select anything
pPrev = pCrsr;
- pCrsr = static_cast<SwPaM*>( pCrsr->GetNext() );
+ if(!bRet)
+ pCrsr = static_cast<SwPaM*>( pCrsr->GetNext() );
}
while( !bRet && (pCrsr != pRingStart) );
}
commit d80fc3deff6b5ddcb89c1c95f05d651e5373393c
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:28:29 2015 +0000
Resource leak
CID: 1028073
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index ff52b1f..f2fb8b4 100755
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -628,6 +628,8 @@ GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(const GraphyicBulletsTypeMgr& aTy
pEntry->sDescription = pSrcEntry->sDescription;
aGrfDataLst.Insert( pEntry, LIST_APPEND );
}
+ else
+ delete pEntry;
}
}
void GraphyicBulletsTypeMgr::Init()
commit bdd653f4a27644fcbf93047d82185e0cc50eef7a
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:26:17 2015 +0000
Resource leak
CID: 1028069
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index e20c5b7..48fa736 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -263,9 +263,11 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
if( ( 1 == pTmp->length ) || ( (sal_Unicode)'/' == pTmp->buffer[1] ) )
{
rtl_uString *pTmp2 = NULL;
+ oslSecurity pSecTemp;
/* osl_getHomeDir returns file URL */
- osl_getHomeDir( osl_getCurrentSecurity(), &pTmp2 );
+ osl_getHomeDir( pSecTemp = osl_getCurrentSecurity(), &pTmp2 );
+ osl_freeSecurityHandle( pSecTemp );
/* remove "file://" prefix */
rtl_uString_newFromStr_WithLength( &pTmp2, pTmp2->buffer + 7, pTmp2->length - 7 );
commit 367050e0c21a3eee92735758db6e8fc35975f09c
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:22:10 2015 +0000
Resource leak
CID: 1028009
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 6762083..45808ce 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2517,6 +2517,8 @@ void OfaTreeOptionsDialog::LoadNodes(
{
pModule ? aNodeList.push_back( pNode ) : rOutNodeList.push_back( pNode );
}
+ else
+ delete pNode;
}
}
commit 2ce7862024ef29d0200c1e077e1ce17364ba7ab2
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Nov 24 15:19:25 2015 +0000
Uninitialized scalar variable
CID: 1028321, 1028322, 1028323
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 4e6346f..9897b83 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3252,8 +3252,8 @@ void SelectionManager::startDrag(
// of our DropTargets at the time of executeDrag we can use
// them for a start
XLIB_Window aRoot, aParent, aChild;
- int root_x, root_y, win_x, win_y;
- unsigned int mask;
+ int root_x(0), root_y(0), win_x, win_y;
+ unsigned int mask(0);
::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it;
it = m_aDropTargets.begin();
More information about the Libreoffice-commits
mailing list