hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ALSA] seq_midi_event: fix encoding of data bytes after end of sysex 

Create a new state ST_INVALID for the encoder to prevent data bytes at
the beginning of a stream or after a sysex message being interpreted as
note-off parameters.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Clemens Ladisch 2007-08-10 09:38:36 +02:00 committed by Jaroslav Kysela
parent 0f28ecd332
commit 394d051686
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/core/seq/seq_midi_event.c
View File

@ -32,10 +32,9 @@ MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("MIDI byte <-> sequencer event coder"); MODULE_DESCRIPTION("MIDI byte <-> sequencer event coder");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* queue type */ /* event type, index into status_event[] */
/* from 0 to 7 are normal commands (note off, on, etc.) */ /* from 0 to 6 are normal commands (note off, on, etc.) for 0x9?-0xe? */
#define ST_NOTEOFF 0 #define ST_INVALID 7
#define ST_NOTEON 1
#define ST_SPECIAL 8 #define ST_SPECIAL 8
#define ST_SYSEX ST_SPECIAL #define ST_SYSEX ST_SPECIAL
/* from 8 to 15 are events for 0xf0-0xf7 */ /* from 8 to 15 are events for 0xf0-0xf7 */
@ -65,7 +64,7 @@ static struct status_event_list {
void (*encode)(struct snd_midi_event *dev, struct snd_seq_event *ev); void (*encode)(struct snd_midi_event *dev, struct snd_seq_event *ev);
void (*decode)(struct snd_seq_event *ev, unsigned char *buf); void (*decode)(struct snd_seq_event *ev, unsigned char *buf);
} status_event[] = { } status_event[] = {
/* 0x80 - 0xf0 */ /* 0x80 - 0xef */
{SNDRV_SEQ_EVENT_NOTEOFF, 2, note_event, note_decode}, {SNDRV_SEQ_EVENT_NOTEOFF, 2, note_event, note_decode},
{SNDRV_SEQ_EVENT_NOTEON, 2, note_event, note_decode}, {SNDRV_SEQ_EVENT_NOTEON, 2, note_event, note_decode},
{SNDRV_SEQ_EVENT_KEYPRESS, 2, note_event, note_decode}, {SNDRV_SEQ_EVENT_KEYPRESS, 2, note_event, note_decode},
@ -73,7 +72,8 @@ static struct status_event_list {
{SNDRV_SEQ_EVENT_PGMCHANGE, 1, one_param_ctrl_event, one_param_decode}, {SNDRV_SEQ_EVENT_PGMCHANGE, 1, one_param_ctrl_event, one_param_decode},
{SNDRV_SEQ_EVENT_CHANPRESS, 1, one_param_ctrl_event, one_param_decode}, {SNDRV_SEQ_EVENT_CHANPRESS, 1, one_param_ctrl_event, one_param_decode},
{SNDRV_SEQ_EVENT_PITCHBEND, 2, pitchbend_ctrl_event, pitchbend_decode}, {SNDRV_SEQ_EVENT_PITCHBEND, 2, pitchbend_ctrl_event, pitchbend_decode},
{SNDRV_SEQ_EVENT_NONE, 0, NULL, NULL}, /* 0xf0 */ /* invalid */
{SNDRV_SEQ_EVENT_NONE, 0, NULL, NULL},
/* 0xf0 - 0xff */ /* 0xf0 - 0xff */
{SNDRV_SEQ_EVENT_SYSEX, 1, NULL, NULL}, /* sysex: 0xf0 */ {SNDRV_SEQ_EVENT_SYSEX, 1, NULL, NULL}, /* sysex: 0xf0 */
{SNDRV_SEQ_EVENT_QFRAME, 1, one_param_event, one_param_decode}, /* 0xf1 */ {SNDRV_SEQ_EVENT_QFRAME, 1, one_param_event, one_param_decode}, /* 0xf1 */
@ -129,6 +129,7 @@ int snd_midi_event_new(int bufsize, struct snd_midi_event **rdev)
} }
dev->bufsize = bufsize; dev->bufsize = bufsize;
dev->lastcmd = 0xff; dev->lastcmd = 0xff;
dev->type = ST_INVALID;
spin_lock_init(&dev->lock); spin_lock_init(&dev->lock);
*rdev = dev; *rdev = dev;
return 0; return 0;
@ -149,7 +150,7 @@ static inline void reset_encode(struct snd_midi_event *dev)
{ {
dev->read = 0; dev->read = 0;
dev->qlen = 0; dev->qlen = 0;
dev->type = 0; dev->type = ST_INVALID;
} }
void snd_midi_event_reset_encode(struct snd_midi_event *dev) void snd_midi_event_reset_encode(struct snd_midi_event *dev)