Takashi Iwai
c349a7f6d8
- Backport upstream fixes: buffer overflow fixes in aplay, segfault in aplaymidi, etc: 0008-topology-include-locale.h.patch 0009-nhlt-dmic-info.c-include-sys-types.h.patch 0010-topology-pre-processor-Add-support-for-enum-controls.patch 0011-configure.ac-fix-UMP-support-detection.patch 0012-bat-really-skip-analysis-of-the-first-period-and-upd.patch 0013-topology-add-include-for-ENABLE_NLS-on-musl.patch 0014-nhlt-use-stdint.h-types.patch 0015-Revert-nhlt-dmic-info.c-include-sys-types.h.patch 0016-aplay-use-stdint.h-types-instead-u_int-u_short-u_cha.patch 0017-alsa-restore.rules-use-devnode-instead-number-atribu.patch 0018-nhlt-Revert-SSP_ANALOG-device_type-field.patch 0019-alsactl-fix-potential-buffer-overwrite.patch 0020-aplay-fix-buffer-overflow-and-tainted-format-string.patch 0021-misc-fix-incorrect-usages-of-strerror.patch 0022-aplay-Add-option-for-specifying-subformat.patch 0023-aplay-allow-to-compile-with-older-alsa-lib-subformat.patch 0024-aplay-log-pcm-status-before-reporting-a-fatal-error.patch 0025-aplay-enable-timestamps-by-default.patch 0026-aplay-status-dumps-are-called-only-in-verbose-mode.patch 0027-aplaymidi-Set-event-completely-for-tempo-event.patch OBS-URL: https://build.opensuse.org/request/show/1137523 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=210
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 4cb3e3a7b5b2347e87747a5544c1f4db62a7be53 Mon Sep 17 00:00:00 2001
|
|
From: "John K. Luebs" <john@luebs.org>
|
|
Date: Sun, 7 Jan 2024 13:33:33 -0600
|
|
Subject: [PATCH] aplaymidi: Set event completely for tempo event
|
|
|
|
After UMP support was added in b399fb8 ev.type setting was inadvertently
|
|
dropped in the code path handling tempo meta event.
|
|
This is causing tempo meta events to not be handled at all.
|
|
Moreover, snd_seq_ev_set_fixed is also missing so MIDI files with
|
|
variable events such as SYSEX before the tempo meta event usually are
|
|
causing a segfault.
|
|
|
|
Fixes: b399fb85a919 ("aplaymidi: Add UMP support")
|
|
Closes: https://github.com/alsa-project/alsa-utils/issues/241
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
seq/aplaymidi/aplaymidi.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/seq/aplaymidi/aplaymidi.c b/seq/aplaymidi/aplaymidi.c
|
|
index a7293d31fb31..66038e278d4a 100644
|
|
--- a/seq/aplaymidi/aplaymidi.c
|
|
+++ b/seq/aplaymidi/aplaymidi.c
|
|
@@ -819,6 +819,8 @@ static void play_midi(void)
|
|
ev.time.tick = event->tick;
|
|
ev.dest = ports[event->port];
|
|
if (event->type == SND_SEQ_EVENT_TEMPO) {
|
|
+ snd_seq_ev_set_fixed(&ev);
|
|
+ ev.type = event->type;
|
|
ev.dest.client = SND_SEQ_CLIENT_SYSTEM;
|
|
ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER;
|
|
ev.data.queue.queue = queue;
|
|
--
|
|
2.35.3
|
|
|