From ddf500f0cd360043af9678e1d2d90c2e311e0d8e Mon Sep 17 00:00:00 2001 From: Seymour Shlien Date: Wed, 10 Mar 2021 13:34:57 -0500 Subject: [PATCH] 2021.03.10 --- VERSION | 2 +- doc/CHANGES | 20 ++++++++++++++++++++ doc/readme.txt | 2 +- store.c | 4 ++-- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index e0f22f7..91e7279 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -2021 February 21 2021 +2021 March 10 2021 diff --git a/doc/CHANGES b/doc/CHANGES index 76d3bbb..35f2dc9 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -14107,4 +14107,24 @@ testing the varieable voicesused before searching for the VOICE feature. +March 10 2021 + +Abc2midi segmentation error: the following tune causes abc2midi to +crash. + +X:6 +T:TEMP +L:1/4 +M:2/2 +Q:1/4=112 +%%MIDI drum d2dd 39 39 39 +%%MIDI drumon +K:G +G4 + +Fix: in event_midi check that the v structure is not NULL before +setting v->hasdrums to 1. If it is NULL send an error message that +%%MIDI drumon must occur after the first K: header. + + diff --git a/doc/readme.txt b/doc/readme.txt index be42127..0d5c661 100644 --- a/doc/readme.txt +++ b/doc/readme.txt @@ -1,7 +1,7 @@ abcMIDI : abc <-> MIDI conversion utilities midi2abc version 3.47 November 01 2020 -abc2midi version 4.49 February 21 2021 +abc2midi version 4.50 March 10 2021 abc2abc version 2.12 October 19 2020 yaps version 1.86 December 10 2020 abcmatch version 1.77 December 10 2020 diff --git a/store.c b/store.c index 0cc24f2..8f8a3fe 100644 --- a/store.c +++ b/store.c @@ -186,7 +186,7 @@ int main() */ -#define VERSION "4.49 February 21 2021 abc2midi" +#define VERSION "4.50 March 10 2021 abc2midi" /* enables reading V: indication in header */ #define XTEN1 1 @@ -2303,11 +2303,11 @@ char *s; else if (strcmp(command,"drumon") == 0 && dotune) { /* [SS] 2010-05-26 */ + if (v == NULL) event_fatal_error("%%MIDI drumon must occur after the first K: header"); addfeature(DRUMON, 0, 0, 0); v->hasdrums = 1; drumvoice = v->indexno; /* [SS] 2010-02-09 */ done = 1; - if (v == NULL) event_error("%%MIDI drumon must occur after the first K: header"); } if (strcmp(command,"drumoff") == 0) { addfeature(DRUMOFF, 0, 0, 0);