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
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From 6e9be2a3f356d79da3b71c9244d4c809baf38e52 Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Date: Fri, 27 Oct 2023 15:05:06 -0500
|
|
Subject: [PATCH] aplay: log pcm status before reporting a fatal error
|
|
|
|
When the --fatal-errors happen, nothing is provided to the user even
|
|
when the '-v' verbose option is specified. This patch adds the fatal
|
|
error exit after dumping the logs. No functionality change, just
|
|
better information on what just happened.
|
|
|
|
Closes: https://github.com/alsa-project/alsa-utils/pull/242
|
|
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
aplay/aplay.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/aplay/aplay.c b/aplay/aplay.c
|
|
index fc4bac697226..ed58a1ec8c7f 100644
|
|
--- a/aplay/aplay.c
|
|
+++ b/aplay/aplay.c
|
|
@@ -1677,12 +1677,6 @@ static void xrun(void)
|
|
prg_exit(EXIT_FAILURE);
|
|
}
|
|
if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) {
|
|
- if (fatal_errors) {
|
|
- error(_("fatal %s: %s"),
|
|
- stream == SND_PCM_STREAM_PLAYBACK ? _("underrun") : _("overrun"),
|
|
- snd_strerror(res));
|
|
- prg_exit(EXIT_FAILURE);
|
|
- }
|
|
if (monotonic) {
|
|
#ifdef HAVE_CLOCK_GETTIME
|
|
struct timespec now, diff, tstamp;
|
|
@@ -1708,6 +1702,12 @@ static void xrun(void)
|
|
fprintf(stderr, _("Status:\n"));
|
|
snd_pcm_status_dump(status, log);
|
|
}
|
|
+ if (fatal_errors) {
|
|
+ error(_("fatal %s: %s"),
|
|
+ stream == SND_PCM_STREAM_PLAYBACK ? _("underrun") : _("overrun"),
|
|
+ snd_strerror(res));
|
|
+ prg_exit(EXIT_FAILURE);
|
|
+ }
|
|
if ((res = snd_pcm_prepare(handle))<0) {
|
|
error(_("xrun: prepare error: %s"), snd_strerror(res));
|
|
prg_exit(EXIT_FAILURE);
|
|
--
|
|
2.35.3
|
|
|