[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - extensions.lst external_deps.lst graphite/graphite-2.3.1-CVE-2016-1521.patch graphite/makefile.mk sal/inc sdext/source set_soenv.in

Andrea Pescetti pescetti at apache.org
Wed Mar 30 13:46:44 UTC 2016 

 extensions.lst                              |   60 ++++++++++++++--------------
 external_deps.lst                           |    5 +-
 graphite/graphite-2.3.1-CVE-2016-1521.patch |   20 +++++++++
 graphite/makefile.mk                        |    2 
 sal/inc/rtl/string.hxx                      |    5 ++
 sdext/source/pdfimport/pdfparse/makefile.mk |    2 
 set_soenv.in                                |    4 +
 7 files changed, 63 insertions(+), 35 deletions(-)

New commits:
commit 2f3f91ebc012cf8c91b73d2d1aef4b88ebac4b50
Author: Andrea Pescetti <pescetti at apache.org>
Date:   Sat Mar 26 11:15:42 2016 +0000

    #i126892# Use a specific mirror for dictionaries, to avoid HTTPS redirections.

diff --git a/extensions.lst b/extensions.lst
index efe09a9..4f859b1 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,115 +39,115 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-    f5f6aab4cc5d92a34ab13ad15332770c http://sourceforge.net/projects/aoo-extensions/files/17102/21/dict-en.oxt/download "dict-en.oxt"
+    f5f6aab4cc5d92a34ab13ad15332770c http://iweb.dl.sourceforge.net/project/aoo-extensions/17102/21/dict-en.oxt "dict-en.oxt"
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
-    e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"
+    e2eab80772ab1aa09716954219351a80 http://iweb.dl.sourceforge.net/project/aoo-extensions/1470/1/en_US.oxt "en_US.oxt"
 
 # German dictionary.
 [ language=de || language=de_DE || language=nl || language=ru ]
-    a9328ce36b272a034b4706721345076d http://sourceforge.net/projects/aoo-extensions/files/1075/13/dict-de_de-frami_2013-12-06.oxt/download "dict-de_DE-frami_2012-06-17.oxt"
+    a9328ce36b272a034b4706721345076d http://iweb.dl.sourceforge.net/project/aoo-extensions/1075/13/dict-de_de-frami_2013-12-06.oxt "dict-de_DE-frami_2012-06-17.oxt"
 
 # Dutch dictionary.
 [ language=nl ]
-    5c0de383ef649cffefc128cfb36b4d43 http://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "nl-dict-v2.00g.oxt"
+    5c0de383ef649cffefc128cfb36b4d43 http://iweb.dl.sourceforge.net/project/aoo-extensions/1456/6/nl-dict-v2.00g.oxt "nl-dict-v2.00g.oxt"
 
 # French dictionary.
 [ language=fr || language=nl || language=de || language=de_DE || language=ca || language=ca_XV ]
-    48343ddb4f020f1c335189ba56f8f50c http://sourceforge.net/projects/aoo-extensions/files/17340/3/lo-oo-ressources-linguistiques-fr-v5.1.oxt/download "dict-fr.oxt"
+    48343ddb4f020f1c335189ba56f8f50c http://iweb.dl.sourceforge.net/project/aoo-extensions/17340/3/lo-oo-ressources-linguistiques-fr-v5.1.oxt "dict-fr.oxt"
 
 # Italian dictionary.
 [ language=it || language=de || language=de_DE ]
-    b20c2bf3114bdca5749606ad707e19be http://sourceforge.net/projects/aoo-extensions/files/1204/14/dict-it.oxt/download "dict-it.oxt"
+    b20c2bf3114bdca5749606ad707e19be http://iweb.dl.sourceforge.net/project/aoo-extensions/1204/14/dict-it.oxt "dict-it.oxt"
 
 # Spanish dictionary.
 [ language=es || language=ca || language=ca_XV ]
-    59dd45e6785ed644adbbd73f4f126182 http://sourceforge.net/projects/aoo-extensions/files/1657/3/es_es.oxt/download "es_es.oxt"
+    59dd45e6785ed644adbbd73f4f126182 http://iweb.dl.sourceforge.net/project/aoo-extensions/1657/3/es_es.oxt "es_es.oxt"
 
 # Danish dictionary.
 [ language=da ]
-    b38cba04b6513dd42b031199d617cce6 http://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt"
-    6ee1e24fb17e44577d8e3200f3e44adc http://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da-current.oxt"
+    b38cba04b6513dd42b031199d617cce6 http://iweb.dl.sourceforge.net/project/aoo-extensions/1388/12/DanskeSynonymer.oxt "DanskeSynonymer.oxt"
+    6ee1e24fb17e44577d8e3200f3e44adc http://iweb.dl.sourceforge.net/project/aoo-extensions/1429/6/dict-da-current.oxt "dict-da-current.oxt"
 
 # Lithuanian dictionary.
 [ language=lt ]
-    d8d4a3d5c6abfde1b4c81cc1ddd1afa0 http://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download "openoffice-spellcheck-lt-1.3.oxt"
+    d8d4a3d5c6abfde1b4c81cc1ddd1afa0 http://iweb.dl.sourceforge.net/project/aoo-extensions/17703/0/openoffice-spellcheck-lt-1.3.oxt "openoffice-spellcheck-lt-1.3.oxt"
 
 # Romanian dictionary.
 [ language=ro ]
-    b05941b975afc0321df0cd48a4d295c8 http://sourceforge.net/projects/aoo-extensions/files/1392/8/dict-ro.1.5.oxt/download "dict-ro.1.5.oxt"
+    b05941b975afc0321df0cd48a4d295c8 http://iweb.dl.sourceforge.net/project/aoo-extensions/1392/8/dict-ro.1.5.oxt "dict-ro.1.5.oxt"
 
 # Russian dictionary.
 [ language=ru ]
-    93921f14809a22770f1bd89af65015bc http://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download "dict-ru.oxt"
+    93921f14809a22770f1bd89af65015bc http://iweb.dl.sourceforge.net/project/aoo-extensions/3233/3/dict_ru_ru-0.3.7.oxt "dict-ru.oxt"
 
 # Slovak dictionary.
 [ language=sk ]
-    5a7cec122a215c9f6a906ecb8ad46ee6 http://sourceforge.net/projects/aoo-extensions/files/1143/11/dict-sk.oxt/download "dict-sk.oxt"
+    5a7cec122a215c9f6a906ecb8ad46ee6 http://iweb.dl.sourceforge.net/project/aoo-extensions/1143/11/dict-sk.oxt "dict-sk.oxt"
 
 # Slovenian dictionary.
 [ language=sl ]
-    26b6cebb0534dfd8dc47ea2b746202ce http://sourceforge.net/projects/aoo-extensions/files/3280/7/pack-sl.oxt/download "dict-sl.oxt"
+    26b6cebb0534dfd8dc47ea2b746202ce http://iweb.dl.sourceforge.net/project/aoo-extensions/3280/7/pack-sl.oxt "dict-sl.oxt"
 
 # German (Austria) dictionary.
 [ language=de || language=de_AT || language=de_DE ]
-  47b868a8949faba36b8f0ff351940967 http://sourceforge.net/projects/aoo-extensions/files/1697/10/dict-de_at-frami_2013-12-06.oxt/download "dict-de_AT-frami_2012-06-17.oxt"
+  47b868a8949faba36b8f0ff351940967 http://iweb.dl.sourceforge.net/project/aoo-extensions/1697/10/dict-de_at-frami_2013-12-06.oxt "dict-de_AT-frami_2012-06-17.oxt"
 
 # German (Switzerland) dictionary.
 [ language=de || language=de_CH || language=de_DE ]
-    f4ab5c31fa394f05dab58ab773ab5012 http://sourceforge.net/projects/aoo-extensions/files/1699/10/dict-de_ch-frami_2013-12-06.oxt/download "dict-de_CH-frami_2012-06-17.oxt"
+    f4ab5c31fa394f05dab58ab773ab5012 http://iweb.dl.sourceforge.net/project/aoo-extensions/1699/10/dict-de_ch-frami_2013-12-06.oxt "dict-de_CH-frami_2012-06-17.oxt"
 
 # Khmer dictionary.
 [ language=km ]
-    a22266cfa40fb23a79be27a239321a3f http://sourceforge.net/projects/aoo-extensions/files/1009/1/km_spellchecker_OOo30_V_1.0.2.oxt/download "km_spellchecker_OOo30_V_1.0.2.oxt"
+    a22266cfa40fb23a79be27a239321a3f http://iweb.dl.sourceforge.net/project/aoo-extensions/1009/1/km_spellchecker_OOo30_V_1.0.2.oxt "km_spellchecker_OOo30_V_1.0.2.oxt"
 
 # Scottish Gaelic.
 [ language=gd ]
-    3a26a49794077643e802cf2cb738ec18 http://sourceforge.net/projects/aoo-extensions/files/4587/10/hunspell-gd-2.8.oxt/download "hunspell-gd-2.8.oxt"
+    3a26a49794077643e802cf2cb738ec18 http://iweb.dl.sourceforge.net/project/aoo-extensions/4587/10/hunspell-gd-2.8.oxt "hunspell-gd-2.8.oxt"
 
 # Basque.
 [ language=eu ]
-    f408bb4a333bea2aec86bffaa4ffa229 http://sourceforge.net/projects/aoo-extensions/files/1383/2/xuxen_4_OOo3.oxt/download "xuxen_4_OOo3.oxt"
+    f408bb4a333bea2aec86bffaa4ffa229 http://iweb.dl.sourceforge.net/project/aoo-extensions/1383/2/xuxen_4_OOo3.oxt "xuxen_4_OOo3.oxt"
 
 # Hungarian.
 [ language=hu ]
-    76345f925e34fef2d29bade4f29108e9 http://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt"
-    d320e43e815c2dfd599dbfb7cd0e41fb http://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt"
+    76345f925e34fef2d29bade4f29108e9 http://iweb.dl.sourceforge.net/project/aoo-extensions/3423/4/lightproof-hu_HU-1.3.oxt "lightproof-hu_HU-1.3.oxt"
+    d320e43e815c2dfd599dbfb7cd0e41fb http://iweb.dl.sourceforge.net/project/aoo-extensions/1283/9/dict-hu.oxt "dict-hu.oxt"
 
 # Asturian.
 [ language=ast ]
-    ed5702f25c8f5e36f97cafc606470c42 http://sourceforge.net/projects/aoo-extensions/files/3932/1/asturianu.oxt/download "asturianu.oxt"
+    ed5702f25c8f5e36f97cafc606470c42 http://iweb.dl.sourceforge.net/project/aoo-extensions/3932/1/asturianu.oxt "asturianu.oxt"
 
 # Norwegian.
 [ language=nb ]
-    e6ca009bc6aa3d70d8b7d66138b1c28d http://sourceforge.net/projects/aoo-extensions/files/1216/6/dictionary-no-NO-2.1.oxt/download "dictionary-no-NO-2.1.oxt"
+    e6ca009bc6aa3d70d8b7d66138b1c28d http://iweb.dl.sourceforge.net/project/aoo-extensions/1216/6/dictionary-no-NO-2.1.oxt "dictionary-no-NO-2.1.oxt"
 
 # Swedish.
 [ language=sv ]
-    32ab4edf1496a7cf5469ee1643eb0128 http://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download "dict-sv.oxt"
+    32ab4edf1496a7cf5469ee1643eb0128 http://iweb.dl.sourceforge.net/project/aoo-extensions/5959/1/dict-sv.oxt "dict-sv.oxt"
 
 # Korean.
 [ language=ko ]
-    c20c155c47174c1b0ec0a53618044ac3 http://sourceforge.net/projects/aoo-extensions/files/5968/0/Korean_spell-checker-0.5.6_OOo.oxt/download "Korean_spell-checker-0.5.6_OOo.oxt"
+    c20c155c47174c1b0ec0a53618044ac3 http://iweb.dl.sourceforge.net/project/aoo-extensions/5968/0/Korean_spell-checker-0.5.6_OOo.oxt "Korean_spell-checker-0.5.6_OOo.oxt"
 
 # Polish.
 [ language=pl ]
-    a69f9221864b1360e38ff3f0b0cc9222 http://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download "pl-dict.oxt"
+    a69f9221864b1360e38ff3f0b0cc9222 http://iweb.dl.sourceforge.net/project/aoo-extensions/806/4/pl-dict.oxt "pl-dict.oxt"
 
 # Portuguese (European).
 [ language=pt || language=pt_PT ]
-    290d182dfad2c65ae2103228a8ed355f http://sourceforge.net/projects/aoo-extensions/files/1196/36/oo3x-pt-pt-15.10.3.1.oxt/download "dict-pt.oxt"
+    290d182dfad2c65ae2103228a8ed355f http://iweb.dl.sourceforge.net/project/aoo-extensions/1196/36/oo3x-pt-pt-15.10.3.1.oxt "dict-pt.oxt"
 
 # Catalan.
 [ language=ca ]
-    ed1c612a462490b541297a8522f667d0 http://sourceforge.net/projects/aoo-extensions/files/1205/3/catalan.oxt/download "dict-ca.oxt"
+    ed1c612a462490b541297a8522f667d0 http://iweb.dl.sourceforge.net/project/aoo-extensions/1205/3/catalan.oxt "dict-ca.oxt"
 
 # Valencian AVL (this is incompatible with Catalan).
 [ language=ca_XV ]
-    3b87a28bf1ff2a8beb76a5b501f40d1c http://sourceforge.net/projects/aoo-extensions/files/1475/0/avl.oxt/download "dict-ca-xv.oxt"
+    3b87a28bf1ff2a8beb76a5b501f40d1c http://iweb.dl.sourceforge.net/project/aoo-extensions/1475/0/avl.oxt "dict-ca-xv.oxt"
 
 # Valencian RACV (this is incompatible with Catalan).
 [ language=ca_XR ]
-    6112a73444a1ad3cf70736649e228f0f http://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict-ca-xr.oxt"
+    6112a73444a1ad3cf70736649e228f0f http://iweb.dl.sourceforge.net/project/aoo-extensions/1395/0/dict_valencian_llit.oxt "dict-ca-xr.oxt"
 
commit e8437bcfd35cb625c15acdf14cd015e3095a2749
Author: Andrea Pescetti <pescetti at apache.org>
Date:   Sat Mar 26 11:01:36 2016 +0000

    #i126892# Use a specific mirror to avoid HTTPS redirections.

diff --git a/external_deps.lst b/external_deps.lst
index 950b598..b8992aa 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -26,8 +26,9 @@
 
 # The primary fallback site.
 # OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
-
-OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
+# OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
+# Use a specific mirror to avoid HTTPS redirections.
+OOO_EXTRAS=http://iweb.dl.sourceforge.net/project/oooextras.mirror/
 
 # Must not fallback to svn
 # SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
commit 2cf713b56abbd798212dd3527bf3ead910421f43
Author: Don Lewis <truckman at apache.org>
Date:   Fri Mar 25 16:26:21 2016 +0000

    #i126890# code: compiling with recent clang generates thousands of infinite-recu
    
    rsion warnings about DbgOut()
    
    If the definition of the overloaded function DbgOut() in
    sal/inc/rtl/string.hxx is compiled without having first compiling
    the the declaration of DbgOut() with a different signature in
    tools/inc/tools/debug.hxx, the compiler thinks DbgOut() is calling
    itself recursively with no means of escape.
    
    Fix this in the case where DBG_UTIL is defined by including
    <tools/debug.hxx> inside string.hxx so that the compiler will
    encounter the declaration of DbgOut() in debug.hxx first in this
    case.  This requires adding a couple of directories to the compiler
    include path so that the new consumers of <tools/debug.hxx> can
    find it as well as one of its dependencies.
    
    If DBG_UTIL is not defined, then debug.hxx does not declare DbgOut(),
    so fix this case by hiding the DbgOut() definition in string.hxx
    behind #ifdef DBG_UTIL since it won't be used in this case.

diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index c3ce09b..346d949 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -32,6 +32,9 @@
 #include <rtl/memory.h>
 #include <rtl/textenc.h>
 #include <rtl/string.h>
+#ifdef DBG_UTIL
+#include <tools/debug.hxx>
+#endif /* DBG_UTIL */
 
 #if !defined EXCEPTIONS_OFF
 #include <new>
@@ -969,8 +972,10 @@ struct CStringHash
 /* Helper methods to support OString messages in OSL_ENSURE, DBG_ERROR, DBG_WARN, DBG_TRACE, etc. */
 inline sal_Bool SAL_CALL osl_assertFailedLine( const sal_Char* pszFileName, sal_Int32 nLine, const ::rtl::OString& rMessage)
     { return osl_assertFailedLine( pszFileName, nLine, rMessage.getStr()); }
+#ifdef DBG_UTIL
 inline void DbgOut( const rtl::OString& rMessage, sal_uInt16 nOutType, const sal_Char* pFileName, sal_uInt16 nLineNum )
     { DbgOut( rMessage.getStr(), nOutType, pFileName, nLineNum); }
+#endif /* DBG_UTIL */
 
 #endif /* __cplusplus */
 
diff --git a/set_soenv.in b/set_soenv.in
index 2d8f2fa..bf990c8 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1380,7 +1380,9 @@ $SOLARINC             = $I.$cur_dir.
                         $I.'$SOLARVER'.$ds.'$INPATH'.$INC.
                         $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
                         $I.'$SOLARENV'.$INC.
-                        $I.'$SRC_ROOT'.$ds."res";
+                        $I.'$SRC_ROOT'.$ds."res".
+                        $I.'$SRC_ROOT'.$ds."tools".$INC.
+                        $I.'$SRC_ROOT'.$ds."comphelper".$INC;
 
 if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
 {
commit 0adb92d44d96cbedb94d8bbc47b47707135ccf88
Author: Don Lewis <truckman at apache.org>
Date:   Sun Mar 20 18:13:21 2016 +0000

    Revert r1735544 and add -DBOOST_SYSTEM_NO_DEPRECATED to CFLAGS in
    
    the makefile that actually has fixes the build problem with modern
    boost.

diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index a6ef5fc..d239616 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -70,8 +70,6 @@ SHL1STDLIBS=\
     $(CPPULIB)			\
     $(SALLIB)
 
-CFLAGS+=-DBOOST_SYSTEM_NO_DEPRECATED
-
 .IF "$(GUI)" == "UNX"
     SHL1STDLIBS+=-lbasegfx_s
 .ELSE
diff --git a/sdext/source/pdfimport/pdfparse/makefile.mk b/sdext/source/pdfimport/pdfparse/makefile.mk
index fd83281..7125826 100644
--- a/sdext/source/pdfimport/pdfparse/makefile.mk
+++ b/sdext/source/pdfimport/pdfparse/makefile.mk
@@ -36,7 +36,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 CFLAGS+=-DSYSTEM_ZLIB
 .ENDIF
 
-ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
+ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE -DBOOST_SYSTEM_NO_DEPRECATED
 
 # --- Files --------------------------------------------------------
 
commit b4bdcd1a1941089f26210bf76d6d52e05d20c3b9
Author: Don Lewis <truckman at apache.org>
Date:   Fri Mar 18 08:07:15 2016 +0000

    Add -DBOOST_SYSTEM_NO_DEPRECATED to CFLAGS to avoid the need to link
    
    with pdfimport plugin -lboost_system when building with recent versions
    of boost.
    
    Suggested by: Jung-uk Kim <jkim at FreeBSD.org> (in another context)

diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index d239616..a6ef5fc 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -70,6 +70,8 @@ SHL1STDLIBS=\
     $(CPPULIB)			\
     $(SALLIB)
 
+CFLAGS+=-DBOOST_SYSTEM_NO_DEPRECATED
+
 .IF "$(GUI)" == "UNX"
     SHL1STDLIBS+=-lbasegfx_s
 .ELSE
commit bfa0632c27a1a9c4e763747cd4e307ea44cf39f3
Author: Don Lewis <truckman at apache.org>
Date:   Fri Mar 18 07:36:15 2016 +0000

    Fix equivalent to Graphite2 CVE-2016-1521.

diff --git a/graphite/graphite-2.3.1-CVE-2016-1521.patch b/graphite/graphite-2.3.1-CVE-2016-1521.patch
new file mode 100644
index 0000000..0bbd2fc
--- /dev/null
+++ b/graphite/graphite-2.3.1-CVE-2016-1521.patch
@@ -0,0 +1,20 @@
+--- misc/silgraphite-2.3.1/engine/src/font/TtfUtil.cpp	2009-01-29 08:33:19 UTC
++++ misc/build/silgraphite-2.3.1/engine/src/font/TtfUtil.cpp	2016-03-17 00:06:29 UTC
+@@ -1106,7 +1106,7 @@ size_t LocaLookup(gr::gid16 nGlyphId, 
+ 	// CheckTable verifies the index_to_loc_format is valid
+ 	if (read(pTable->index_to_loc_format) == Sfnt::FontHeader::ShortIndexLocFormat)
+ 	{ // loca entries are two bytes and have been divided by two
+-		if (nGlyphId <= (lLocaSize >> 1) - 1) // allow sentinel value to be accessed
++		if (lLocaSize >= 2 && nGlyphId <= (lLocaSize >> 1) - 1) // allow sentinel value to be accessed
+ 		{
+ 			const uint16 * pTable = reinterpret_cast<const uint16 *>(pLoca);
+ 			return (read(pTable[nGlyphId]) << 1);
+@@ -1115,7 +1115,7 @@ size_t LocaLookup(gr::gid16 nGlyphId, 
+ 	
+ 	if (read(pTable->index_to_loc_format) == Sfnt::FontHeader::LongIndexLocFormat)
+ 	{ // loca entries are four bytes
+-		if (nGlyphId <= (lLocaSize >> 2) - 1)
++		if (lLocaSize >= 4 && nGlyphId <= (lLocaSize >> 2) - 1)
+ 		{
+ 			const uint32 * pTable = reinterpret_cast<const uint32 *>(pLoca);
+ 			return read(pTable[nGlyphId]);
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 6f72808..a55ff37 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -50,7 +50,7 @@ all:
 
 TARFILE_NAME=silgraphite-2.3.1
 TARFILE_MD5=d35724900f6a4105550293686688bbb3
-PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch graphite-2.3.1_stlportemu.patch
+PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch graphite-2.3.1_stlportemu.patch graphite-2.3.1-CVE-2016-1521.patch
 
 # convert line-endings to avoid problems when patching
 CONVERTFILES=\

More information about the Libreoffice-commits mailing list