From 8138b84323e19faa855c7e52f9866a0150fe2d2e Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 21 Oct 2018 02:20:17 +0000 Subject: harfbuzz 2.0.2 git-svn-id: svn://tug.org/texlive/trunk@48962 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/README | 2 +- Build/source/libs/harfbuzz/ChangeLog | 5 + Build/source/libs/harfbuzz/TLpatches/ChangeLog | 5 + Build/source/libs/harfbuzz/TLpatches/TL-Changes | 2 +- Build/source/libs/harfbuzz/configure | 24 ++-- Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog | 142 +++++++++++++++++++++ Build/source/libs/harfbuzz/harfbuzz-src/NEWS | 6 + Build/source/libs/harfbuzz/harfbuzz-src/TODO | 2 - .../source/libs/harfbuzz/harfbuzz-src/configure.ac | 2 +- .../harfbuzz-src/src/hb-aat-layout-common.hh | 2 +- .../harfbuzz-src/src/hb-aat-layout-kerx-table.hh | 5 +- .../libs/harfbuzz/harfbuzz-src/src/hb-blob.cc | 6 +- Build/source/libs/harfbuzz/version.ac | 2 +- 13 files changed, 181 insertions(+), 24 deletions(-) diff --git a/Build/source/libs/README b/Build/source/libs/README index 2de7440dbca..0d885abe960 100644 --- a/Build/source/libs/README +++ b/Build/source/libs/README @@ -25,7 +25,7 @@ graphite2 1.3.12 - checked 16aug18 http://sourceforge.net/projects/silgraphite/files/graphite2/ (requires C++11) -harfbuzz 2.0.1 - checked 20oct18 +harfbuzz 2.0.2 - checked 21oct18 http://www.freedesktop.org/software/harfbuzz/release/ icu 61.1 - checked 29mar18 diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 6bf57987645..7ab06779d89 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,8 @@ +2018-10-21 Akira Kakuto + + Import harfbuzz-2.0.2. + * version.ac: Adjusted. + 2018-10-20 Akira Kakuto Import harfbuzz-2.0.1. diff --git a/Build/source/libs/harfbuzz/TLpatches/ChangeLog b/Build/source/libs/harfbuzz/TLpatches/ChangeLog index dd5923ea964..286b90952c4 100644 --- a/Build/source/libs/harfbuzz/TLpatches/ChangeLog +++ b/Build/source/libs/harfbuzz/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2018-10-21 Akira Kakuto + + Imported harfbuzz-2.0.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + 2018-10-20 Akira Kakuto Imported harfbuzz-2.0.1 source tree from: diff --git a/Build/source/libs/harfbuzz/TLpatches/TL-Changes b/Build/source/libs/harfbuzz/TLpatches/TL-Changes index d977c98a9cc..8cffd75b277 100644 --- a/Build/source/libs/harfbuzz/TLpatches/TL-Changes +++ b/Build/source/libs/harfbuzz/TLpatches/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the harfbuzz-2.0.1/ tree as obtained from: +Changes applied to the harfbuzz-2.0.2/ tree as obtained from: http://www.freedesktop.org/software/harfbuzz/release/ Removed: diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index b435769feed..2390e4de9fd 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 2.0.1. +# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 2.0.2. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='harfbuzz (TeX Live)' PACKAGE_TARNAME='harfbuzz--tex-live-' -PACKAGE_VERSION='2.0.1' -PACKAGE_STRING='harfbuzz (TeX Live) 2.0.1' +PACKAGE_VERSION='2.0.2' +PACKAGE_STRING='harfbuzz (TeX Live) 2.0.2' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1317,7 +1317,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures harfbuzz (TeX Live) 2.0.1 to adapt to many kinds of systems. +\`configure' configures harfbuzz (TeX Live) 2.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1388,7 +1388,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of harfbuzz (TeX Live) 2.0.1:";; + short | recursive ) echo "Configuration of harfbuzz (TeX Live) 2.0.2:";; esac cat <<\_ACEOF @@ -1495,7 +1495,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -harfbuzz (TeX Live) configure 2.0.1 +harfbuzz (TeX Live) configure 2.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2131,7 +2131,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by harfbuzz (TeX Live) $as_me 2.0.1, which was +It was created by harfbuzz (TeX Live) $as_me 2.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4054,7 +4054,7 @@ fi # Define the identity of the package. PACKAGE='harfbuzz--tex-live-' - VERSION='2.0.1' + VERSION='2.0.2' # Some tools Automake needs. @@ -4248,8 +4248,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags HB_VERSION_MAJOR=2 HB_VERSION_MINOR=0 -HB_VERSION_MICRO=1 -HB_VERSION=2.0.1 +HB_VERSION_MICRO=2 +HB_VERSION=2.0.2 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -8143,7 +8143,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by harfbuzz (TeX Live) $as_me 2.0.1, which was +This file was extended by harfbuzz (TeX Live) $as_me 2.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8209,7 +8209,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -harfbuzz (TeX Live) config.status 2.0.1 +harfbuzz (TeX Live) config.status 2.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog index ea0b26e87b4..fdec5fb9abc 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog @@ -1,3 +1,112 @@ +commit 8931bc4a6b41a2a41069b99cb5c551fa30216f0b +Author: Ebrahim Byagowi +Date: Sat Oct 20 23:23:32 2018 +0330 + + [test] Fix -Wunused-parameter on test-font.c + + test/api/test-font.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68b705076808d4b0a4ac3bfa945b8f9ae23db1df +Author: Behdad Esfahbod +Date: Sat Oct 20 12:09:41 2018 -0700 + + [kerx] Fix sanitize of KerxSubtableFormat2::array read + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11033 + + src/hb-aat-layout-kerx-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 00fdbca4f6a5c4623b9c4838da502cccce8aaa74 +Author: Behdad Esfahbod +Date: Sat Oct 20 12:04:51 2018 -0700 + + [aat] Fix LookupFormat10 sanitize + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11060 + + src/hb-aat-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f11c557662dee16a59bb54276c50a96e4e675201 +Author: Behdad Esfahbod +Date: Sat Oct 20 11:56:30 2018 -0700 + + [test] Fix leak + + test/api/test-font.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 440a675c7cc72c7c77b4ad7b20c855c53808ef48 +Author: Ebrahim Byagowi +Date: Sat Oct 20 21:13:25 2018 +0330 + + [TODO] Remove BCP 47 language handling item + + Closes https://github.com/harfbuzz/harfbuzz/issues/1286 + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit d39acc5a95f968b0dbfd5a942abda606d9aa3343 +Author: Ebrahim Byagowi +Date: Sat Oct 20 12:20:30 2018 +0330 + + [fuzzing] Add new testcases + + .../clusterfuzz-testcase-hb-shape-fuzzer-5688420752424960 | Bin 0 -> + 163 bytes + ...zz-testcase-minimized-hb-shape-fuzzer-5688420752424960 | Bin 0 -> + 69 bytes + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 1e55e21dea78aaaddc0715e7df96fd198ec8f78a +Merge: 964ae32a d084719f +Author: Ebrahim Byagowi +Date: Sat Oct 20 07:45:46 2018 +0330 + + Merge pull request #1283 from khaledhosny/cygwin + + Cygwin fixes and CI build + +commit 964ae32aac793540a49c44efab878592394d48db +Author: Ebrahim Byagowi +Date: Sat Oct 20 07:39:18 2018 +0330 + + Run valgrind on run-shape-fuzzer only when RUN_VALGRIND is set (#1285) + + .circleci/config.yml | 2 +- + test/fuzzing/run-shape-fuzzer-tests.py | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit f70f994112b2577271c20a929f7b980fa1d17428 +Author: Behdad Esfahbod +Date: Fri Oct 19 20:00:36 2018 -0700 + + Minor + + test/api/test-ot-name.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e09fb8f7a93ec0c8d7f71cd58772ba468b5523f +Author: Behdad Esfahbod +Date: Fri Oct 19 19:59:41 2018 -0700 + + Oops. Fix build + + test/api/test-map.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9e288d29d86ef27acacd397b1abf04d512f1e61e +Author: Behdad Esfahbod +Date: Fri Oct 19 19:47:27 2018 -0700 + + [test-map] Cosmetic + + test/api/test-map.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + commit 7c2c8ac301b526da8b5384d6b90f156ca096568e Author: Behdad Esfahbod Date: Fri Oct 19 19:37:46 2018 -0700 @@ -45,6 +154,17 @@ Date: Fri Oct 19 19:01:01 2018 -0700 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) +commit d084719ff5a9e0e363bf352037f85b884bff11a7 +Author: Khaled Hosny +Date: Sat Oct 20 00:18:36 2018 +0200 + + Add Cygwin CI build + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1274 + + appveyor.yml | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + commit 29d877518fc2c29083cd7b955b422087966235f7 Author: Behdad Esfahbod Date: Fri Oct 19 16:06:54 2018 -0700 @@ -71,6 +191,28 @@ Date: Fri Oct 19 15:23:49 2018 -0700 src/hb-open-type.hh | 3 +++ 4 files changed, 63 insertions(+), 5 deletions(-) +commit cf92cb7e002f479505fed8c2c55ab12dcbea2d83 +Author: Khaled Hosny +Date: Fri Oct 19 22:21:39 2018 +0200 + + Use g_strdup instead of strdup + + Cygwin does not seem to have strdup. + + util/options.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 30cbe6158de1ddc0546d55e4edc1fe264e1b86ef +Author: Khaled Hosny +Date: Fri Oct 19 22:04:56 2018 +0200 + + Use O_BINARY instead of _O_BINARY + + Cygwin does not seem to have the later + + src/hb-blob.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + commit 257ded1f9ec653d15e79d2ea0a83bd8c5c53d831 Author: Behdad Esfahbod Date: Fri Oct 19 11:20:14 2018 -0700 diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS index 3d82e221c9e..b8d36408193 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS +++ b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS @@ -1,3 +1,9 @@ +Overview of changes leading to 2.0.2 +Saturday, October 20, 2018 +==================================== +- Fix two minor memory access issues in AAT tables. + + Overview of changes leading to 2.0.1 Friday, October 19, 2018 ==================================== diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/TODO b/Build/source/libs/harfbuzz/harfbuzz-src/TODO index d2c5812a007..d8e41050ec5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/TODO +++ b/Build/source/libs/harfbuzz/harfbuzz-src/TODO @@ -15,8 +15,6 @@ API additions - Add sanitize API. -- BCP 47 language handling / API (language_matches?) - - Add query / enumeration API for aalt-like features? - Add segmentation API diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac index ef32bd5102f..a2d0992a724 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac +++ b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([HarfBuzz], - [2.0.1], + [2.0.2], [https://github.com/harfbuzz/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh index 60724c180f6..a99ccaf9f99 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh @@ -285,7 +285,7 @@ struct LookupFormat10 valueArrayZ; /* The lookup values (indexed by the glyph index * minus the value of firstGlyph). */ public: - DEFINE_SIZE_ARRAY (6, valueArrayZ); + DEFINE_SIZE_ARRAY (8, valueArrayZ); }; template diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-kerx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-kerx-table.hh index 6425780910b..e8eb43b8764 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-kerx-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-kerx-table.hh @@ -103,7 +103,8 @@ struct KerxSubTableFormat0 inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (likely (pairs.sanitize (c))); + return_trace (likely (c->check_struct (this) && + pairs.sanitize (c))); } protected: @@ -275,7 +276,7 @@ struct KerxSubTableFormat2 inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (likely (rowWidth.sanitize (c) && + return_trace (likely (c->check_struct (this) && leftClassTable.sanitize (c, this) && rightClassTable.sanitize (c, this) && c->check_range (this, array))); diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.cc index edee6730053..368491c057d 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.cc @@ -487,8 +487,8 @@ hb_blob_t::try_make_writable (void) #if defined(_WIN32) || defined(__CYGWIN__) # include #else -# ifndef _O_BINARY -# define _O_BINARY 0 +# ifndef O_BINARY +# define O_BINARY 0 # endif #endif @@ -540,7 +540,7 @@ hb_blob_create_from_file (const char *file_name) hb_mapped_file_t *file = (hb_mapped_file_t *) calloc (1, sizeof (hb_mapped_file_t)); if (unlikely (!file)) return hb_blob_get_empty (); - int fd = open (file_name, O_RDONLY | _O_BINARY, 0); + int fd = open (file_name, O_RDONLY | O_BINARY, 0); if (unlikely (fd == -1)) goto fail_without_close; struct stat st; diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac index 792d125099a..92ef8dd6a23 100644 --- a/Build/source/libs/harfbuzz/version.ac +++ b/Build/source/libs/harfbuzz/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current harfbuzz version -m4_define([harfbuzz_version], [2.0.1]) +m4_define([harfbuzz_version], [2.0.2]) -- cgit v1.2.3