LibSpiro 20200505 - Version 1.1.0

Collective fixes from tagpoint v1.0 (20190731) up to now v1.1 (20200505).
fontforge · May 5, 2020 · 84ce4df · 84ce4df
1 parent b4d0d4a
commit 84ce4df
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 15 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,21 @@
+- 2020-May-05
+    * Libspiro Version 20200505 (1.1.0)
+    * Bugfix for CVE-2019-19847 affecting {call-test14 to call-test19}.
+    * Fix a memory access bug/error created earlier by patch 2017oct28
+      Users using tagpoint libspiro20150702 are unaffected by this bug.
+      Users using tagpoint libspiro20190731 are recommended to upgrade.
+      Thanks to Frederic Cambus for calling attention to these faults.
+    * Add optional 'end knot' for open curves (useful for displaying).
+    * CRA Version also higher than so-bump 1.0.5 used on some distros;
+      this maybe of interest to distros that bumped an earlier version.
+    * Some garbage-in/garbage-out checks to verify we have 'ah' pairs,
+      and we don't start with ']', or end with '['. Add libspiro.3 man.
+    * Corrected set_di_to_x1y1() to use a constant bandwidth of 0.0005
+    * Code improvements and bug fixes for better tagged/spiro results.
+    * Several improvements added to further increase libspiro's speed.
+
 - 2019-Jul-31
-    * Libspiro Version 20190731
+    * Libspiro Version 20190731 (1.0.0)
     * Corrected library to report correctly as next version up. This is
       probably a significant change, therefore bumped library to start
       at 1.0 even though backwards compatibility remains close to same.

diff --git a/config.guess b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-07-24'
+timestamp='2020-04-26'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -99,6 +99,8 @@ tmp=
 trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
 
 set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
     : "${TMPDIR=/tmp}"
     # shellcheck disable=SC2039
     { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
@@ -274,6 +276,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:Sortix:*:*)
 	echo "$UNAME_MACHINE"-unknown-sortix
 	exit ;;
+    *:Twizzler:*:*)
+	echo "$UNAME_MACHINE"-unknown-twizzler
+	exit ;;
     *:Redox:*:*)
 	echo "$UNAME_MACHINE"-unknown-redox
 	exit ;;
@@ -921,7 +926,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -1624,6 +1629,12 @@ copies of config.guess and config.sub with the latest versions from:
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+EOF
+
+year=`echo $timestamp | sed 's,-.*,,'`
+# shellcheck disable=SC2003
+if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then
+   cat >&2 <<EOF
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
@@ -1651,6 +1662,7 @@ UNAME_RELEASE = "$UNAME_RELEASE"
 UNAME_SYSTEM  = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 

diff --git a/config.sub b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-06-30'
+timestamp='2020-04-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1343,7 +1343,7 @@ case $os in
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* | kopensolaris* | plan9* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* \
+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
 	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
 	     | knetbsd* | mirbsd* | netbsd* \
@@ -1366,7 +1366,7 @@ case $os in
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix)
+	     | nsk* | powerunix*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	qnx*)

diff --git a/configure.ac b/configure.ac
@@ -1,12 +1,12 @@
 # -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 2013...2019 by Joe Da Silva
+# Copyright (C) 2013...2020 by Joe Da Silva
 
 AC_PREREQ([2.64])
 #-------------------------------------------
 # PackageTimestamp version
-m4_define([spiro_package_stamp], [20190731])
+m4_define([spiro_package_stamp], [20200505])
 #-------------------------------------------
 # Making point releases:
 #   spiro_major_version += 0;
@@ -21,7 +21,7 @@ m4_define([spiro_package_stamp], [20190731])
 #   spiro_minor_version = 0;
 #
 m4_define([spiro_major_version], [1])
-m4_define([spiro_minor_version], [0])
+m4_define([spiro_minor_version], [1])
 m4_define([spiro_version],[spiro_major_version.spiro_minor_version])
 
 #-------------------------------------------
@@ -45,7 +45,7 @@ m4_define([spiro_version],[spiro_major_version.spiro_minor_version])
 #  spiro_age = 0
 #
 m4_define([spiro_current], [1])
-m4_define([spiro_revision],[0])
+m4_define([spiro_revision],[1])
 m4_define([spiro_age],     [0])
 m4_define([spiro_libver],[spiro_current:spiro_revision:spiro_age])
 

diff --git a/spiro.c b/spiro.c
@@ -1117,6 +1117,7 @@ spiro_seg_to_bpath1(const double ks[4], double *dm, double *di,
     }
 }
 
+/* deprecated / keep backwards compatibility / not scalable */
 static void
 spiro_seg_to_bpath(const double ks[4],
 		   double x0, double y0, double x1, double y1,
@@ -1251,7 +1252,7 @@ spiro_to_bpath0(const spiro_cp *src, const spiro_seg *s,
 
     nsegs = n;
     if (s[0].ty == '{') {
-	if (n - 2 >= 0 && s[n - 2].ty == 'a')
+	if (n >= 2 && s[n - 2].ty == 'a')
 	    --nsegs;
 	--nsegs;
 	z = -1;