Hello community, here is the log from the commit of package abcm2ps for openSUSE:Factory checked in at 2020-11-23 15:49:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abcm2ps (Old) and /work/SRC/openSUSE:Factory/.abcm2ps.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "abcm2ps" Mon Nov 23 15:49:12 2020 rev:12 rq:850112 version:8.14.10 Changes: -------- --- /work/SRC/openSUSE:Factory/abcm2ps/abcm2ps.changes 2020-06-22 17:46:15.325912798 +0200 +++ /work/SRC/openSUSE:Factory/.abcm2ps.new.5913/abcm2ps.changes 2020-11-23 18:37:13.988544430 +0100 @@ -1,0 +2,10 @@ +Mon Nov 23 08:39:47 UTC 2020 - Michael Vetter <mvet...@suse.com> + +- Update to 8.14.10: + * fix: bad glyph when defined by SVG containing 'v' in + * fix: bad check of note length since commit 191fa55 + * fix: memory corruption when error in %%staves/%%score + * fix: crash when too big note duration + * fix: crash when staff width too small + +------------------------------------------------------------------- Old: ---- abcm2ps-8.14.9.tar.gz New: ---- abcm2ps-8.14.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abcm2ps.spec ++++++ --- /var/tmp/diff_new_pack.bYSdPi/_old 2020-11-23 18:37:14.800545269 +0100 +++ /var/tmp/diff_new_pack.bYSdPi/_new 2020-11-23 18:37:14.800545269 +0100 @@ -18,7 +18,7 @@ Name: abcm2ps -Version: 8.14.9 +Version: 8.14.10 Release: 0 Summary: A program to typeset abc tunes into Postscript License: LGPL-3.0-or-later ++++++ abcm2ps-8.14.9.tar.gz -> abcm2ps-8.14.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.9/abcparse.c new/abcm2ps-8.14.10/abcparse.c --- old/abcm2ps-8.14.9/abcparse.c 2020-06-21 18:03:16.000000000 +0200 +++ new/abcm2ps-8.14.10/abcparse.c 2020-11-20 14:36:58.000000000 +0100 @@ -1804,7 +1804,7 @@ len = dur_u; if (isdigit((unsigned char) *p)) { len *= strtol(p, &q, 10); - if (len <= 0) { + if (len <= 0 || len > 10000) { syntax("Bad length", p); len = dur_u; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.9/configure new/abcm2ps-8.14.10/configure --- old/abcm2ps-8.14.9/configure 2020-06-21 18:03:16.000000000 +0200 +++ new/abcm2ps-8.14.10/configure 2020-11-20 14:36:58.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # (automatic update) -VERSION=8.14.9 -VDATE=2020-06-21 +VERSION=8.14.10 +VDATE=2020-11-20 CC=gcc PKG_CONFIG=pkg-config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.9/format.c new/abcm2ps-8.14.10/format.c --- old/abcm2ps-8.14.9/format.c 2020-06-21 18:03:16.000000000 +0200 +++ new/abcm2ps-8.14.10/format.c 2020-11-20 14:36:58.000000000 +0100 @@ -1344,7 +1344,29 @@ case FORMAT_U: *((float *) fd->v) = scan_u(p, fd->subtype); switch (fd->subtype) { + case 1: + if (strcmp(fd->name, "rightmargin") != 0 + && strcmp(fd->name, "leftmargin") != 0) + break; + staffwidth = cfmt.pagewidth - + cfmt.leftmargin - + cfmt.rightmargin; + if (staffwidth > 100) + break; + error(1, NULL, "'staffwidth' too small\n"); + staffwidth = 100; + if (fd->name[0] == 'r') + cfmt.rightmargin = cfmt.pagewidth - + cfmt.leftmargin - staffwidth; + else + cfmt.leftmargin = cfmt.pagewidth - + cfmt.rightmargin - staffwidth; + break; case 2: /* staffwidth */ + if (staffwidth < 100) { + error(1, NULL, "'staffwidth' too small\n"); + break; + } f = (cfmt.landscape ? cfmt.pageheight : cfmt.pagewidth) - staffwidth - cfmt.leftmargin; if (f < 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.9/parse.c new/abcm2ps-8.14.10/parse.c --- old/abcm2ps-8.14.9/parse.c 2020-06-21 18:03:16.000000000 +0200 +++ new/abcm2ps-8.14.10/parse.c 2020-11-20 14:36:58.000000000 +0100 @@ -2321,6 +2321,11 @@ struct staff_s *p_staff, staves[MAXVOICE]; int i, flags, voice, staff, range, dup_voice, maxtime; + memset(staves, 0, sizeof staves); + parse_staves(s, staves); + if (staves[0].voice < 0) // if error + return; + voice_compress(); voice_dup(); @@ -2376,9 +2381,6 @@ } staves_found = maxtime; - memset(staves, 0, sizeof staves); - parse_staves(s, staves); - /* initialize the voices */ for (voice = 0, p_voice = voice_tb; voice < MAXVOICE; @@ -4612,6 +4614,7 @@ for (;;) { if (*p == '\0' || *p == '"') break; + i = 0; switch (*p++) { default: if ((isdigit((unsigned char) p[-1])) @@ -4654,7 +4657,8 @@ *r++ = ' '; *r++ = '0'; op = "RL"; - npar = 1; + i = 1; + npar = 2; break; case 'z': op = "closepath"; @@ -4698,7 +4702,7 @@ break; } *r++ = ' '; - for (i = 0; i < npar; i++) { + for ( ; i < npar; i++) { while (isspace((unsigned char) *p)) p++; if (i & 1) { // y is inverted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcm2ps-8.14.9/subs.c new/abcm2ps-8.14.10/subs.c --- old/abcm2ps-8.14.9/subs.c 2020-06-21 18:03:16.000000000 +0200 +++ new/abcm2ps-8.14.10/subs.c 2020-11-20 14:36:58.000000000 +0100 @@ -1403,7 +1403,7 @@ } } -/* -- move trailing "The" to front, set to uppercase letters or add xref -- */ +// -- move trailing article to front, set to uppercase letters and add xref char *trim_title(char *p, struct SYMBOL *title) { char *b, *q, *r; _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org