From 794123fb1f8929b208622244163dd2df7cdcdb82 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sat, 11 Mar 2017 21:30:40 +0000 Subject: harfbuzz 1.4.5 git-svn-id: svn://tug.org/texlive/trunk@43457 c570f23f-e606-0410-a88d-b1316a301751 --- 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 | 38 ++++++++++++++++++++++ Build/source/libs/harfbuzz/harfbuzz-src/NEWS | 8 +++++ .../source/libs/harfbuzz/harfbuzz-src/configure.ac | 2 +- .../harfbuzz-src/src/hb-buffer-serialize.cc | 2 ++ .../src/hb-ot-layout-gsubgpos-private.hh | 7 ++-- Build/source/libs/harfbuzz/version.ac | 2 +- 10 files changed, 77 insertions(+), 18 deletions(-) (limited to 'Build/source/libs/harfbuzz') diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 1886864f353..f4a6bedea82 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,8 @@ +2017-03-11 Akira Kakuto + + Import harfbuzz-1.4.5. + * version.ac: Adjusted. + 2017-03-06 Akira Kakuto Import harfbuzz-1.4.4. diff --git a/Build/source/libs/harfbuzz/TLpatches/ChangeLog b/Build/source/libs/harfbuzz/TLpatches/ChangeLog index 72a58d4d2c5..16c425bf8ec 100644 --- a/Build/source/libs/harfbuzz/TLpatches/ChangeLog +++ b/Build/source/libs/harfbuzz/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2017-03-11 Akira Kakuto + + Imported harfbuzz-1.4.5 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + 2017-03-06 Akira Kakuto Imported harfbuzz-1.4.4 source tree from: diff --git a/Build/source/libs/harfbuzz/TLpatches/TL-Changes b/Build/source/libs/harfbuzz/TLpatches/TL-Changes index d197056856a..6f193dccd20 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-1.4.4/ tree as obtained from: +Changes applied to the harfbuzz-1.4.5/ 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 dcf9c15b909..93840eb3261 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) 1.4.4. +# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.4.5. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='harfbuzz (TeX Live)' PACKAGE_TARNAME='harfbuzz--tex-live-' -PACKAGE_VERSION='1.4.4' -PACKAGE_STRING='harfbuzz (TeX Live) 1.4.4' +PACKAGE_VERSION='1.4.5' +PACKAGE_STRING='harfbuzz (TeX Live) 1.4.5' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1312,7 +1312,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) 1.4.4 to adapt to many kinds of systems. +\`configure' configures harfbuzz (TeX Live) 1.4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.4.4:";; + short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.4.5:";; esac cat <<\_ACEOF @@ -1490,7 +1490,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -harfbuzz (TeX Live) configure 1.4.4 +harfbuzz (TeX Live) configure 1.4.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2080,7 +2080,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 1.4.4, which was +It was created by harfbuzz (TeX Live) $as_me 1.4.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4003,7 +4003,7 @@ fi # Define the identity of the package. PACKAGE='harfbuzz--tex-live-' - VERSION='1.4.4' + VERSION='1.4.5' cat >>confdefs.h <<_ACEOF @@ -4206,8 +4206,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags HB_VERSION_MAJOR=1 HB_VERSION_MINOR=4 -HB_VERSION_MICRO=4 -HB_VERSION=1.4.4 +HB_VERSION_MICRO=5 +HB_VERSION=1.4.5 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6866,7 +6866,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 1.4.4, which was +This file was extended by harfbuzz (TeX Live) $as_me 1.4.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6932,7 +6932,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 1.4.4 +harfbuzz (TeX Live) config.status 1.4.5 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 f0964ec544b..fd8b8c03c20 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog @@ -1,3 +1,41 @@ +commit 47e7a1800fba9b8bf042a1f4976a15ab012ebfc7 +Author: Behdad Esfahbod +Date: Fri Mar 10 13:23:02 2017 -0800 + + Revert "Fix Context lookup application when moving back after a + glyph delete" + + This reverts commit b9b005f3a44ccf78a45b212b126287b69b9f4b40. + + This introduced invalid access cases. Revert until I fix correctly. + + src/hb-ot-layout-gsubgpos-private.hh | 7 ++++--- + .../sha1sum/5bbf3712e6f79775c66a4407837a90e591efbef2.ttf | Bin 6400 -> + 0 bytes + test/shaping/tests/context-matching.tests | 1 - + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 3c080a7a0aefec1e9620e3fb399ad280ea4ee5a2 +Author: Behdad Esfahbod +Date: Tue Mar 7 18:13:28 2017 -0800 + + Fix buffer serialize of empty buffer + + Ouch! + + src/hb-buffer-serialize.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8e42c3cb2bb81351d0a28f213cb4f6d35f4b5e46 +Author: Behdad Esfahbod +Date: Sun Mar 5 13:54:56 2017 -0800 + + 1.4.4 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + commit 9ac9af725c781f4597e8db46cf330d595c072739 Author: Behdad Esfahbod Date: Sun Mar 5 13:51:01 2017 -0800 diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS index 48a51d68fe4..b878793af66 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS +++ b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS @@ -1,3 +1,11 @@ +Overview of changes leading to 1.4.5 +Friday, March 10, 2017 +==================================== + +- Revert "Fix Context lookup application when moving back after a glyph..." + This introduced memory access problems. To be fixed properly soon. + + Overview of changes leading to 1.4.4 Sunday, March 5, 2017 ==================================== diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac index 55b48a53b8a..91fbfd70b8a 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], - [1.4.4], + [1.4.5], [https://github.com/behdad/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-serialize.cc index 63a0f34669a..85696c58962 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-serialize.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-serialize.cc @@ -311,6 +311,8 @@ hb_buffer_serialize_glyphs (hb_buffer_t *buffer, if (!buf_consumed) buf_consumed = &sconsumed; *buf_consumed = 0; + if (buf_size) + *buf = '\0'; assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos-private.hh index 005ed21d804..f9fcec52b77 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos-private.hh @@ -1021,13 +1021,14 @@ static inline bool apply_lookup (hb_apply_context_t *c, */ end += delta; - if (end < int (match_positions[idx])) + if (end <= int (match_positions[idx])) { /* End might end up being smaller than match_positions[idx] if the recursed - * lookup ended up removing too many items. + * lookup ended up removing many items, more than we have had matched. * Just never rewind end back and get out of here. * https://bugs.chromium.org/p/chromium/issues/detail?id=659496 */ end = match_positions[idx]; + /* There can't be any further changes. */ break; } @@ -1040,7 +1041,7 @@ static inline bool apply_lookup (hb_apply_context_t *c, } else { - /* NOTE: delta is non-positive. */ + /* NOTE: delta is negative. */ delta = MAX (delta, (int) next - (int) count); next -= delta; } diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac index b9f790cd2b1..cd6d31b2db3 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], [1.4.4]) +m4_define([harfbuzz_version], [1.4.5]) -- cgit v1.2.3