forked from pool/alsa-utils
Takashi Iwai
7200ea9d85
- Backport upstream patches: A few portability fixes, alsaucm fixes and extensions, alsatplg minor fixes, alsa-info.sh extensions: 0001-treewide-sys-poll-to-poll.patch 0002-treewide-Fix-wrong-formats-on-32-bit.patch 0003-treewide-Fix-printf-formats.patch 0004-aplay-Adjust-buffer-sizes-to-fix-snprintf-warnings.patch 0005-aplay-Limit-VUMeter-progress-bar-to-100-for-negative.patch 0006-alsactl-sysfs-add-sys-kernel-uevent_seqnum-check-to-.patch 0007-alsaucm-use-the-first-sound-card-use-case-name-hw-CA.patch 0008-alsaucm-add-text-dump-command.patch 0009-alsaucm-add-json-dump-command.patch 0010-alsaucm-dump-fix-the-prefixed.patch 0011-alsactl-fix-sched-idle-set-it-really-to-SCHED_IDLE.patch 0012-configure-Fix-linking-of-alsatplg-with-the-older-lib.patch 0013-alsatplg-add-n-normalize-option.patch 0014-alsatplg-add-s-sort-and-fix-memory-leaks.patch 0015-alsatplg-fix-another-small-leak-in-normalize_config.patch 0016-alsa-info.sh-Consolidate-PCI-device-output.patch 0017-alsa-info.sh-Read-from-proc-modules-and-sort-the-res.patch 0018-alsa-info.sh-Simplify-iteration-over-cards-when-call.patch 0019-alsa-info.sh-Use-existing-function-to-print-ALSA-con.patch 0020-alsa-info.sh-Exit-script-after-writing-information-t.patch 0021-alsa-info.sh-Replace-gauge-with-infobox-for-upload-d.patch 0022-alsa-info.sh-Remove-progress-spinner-during-upload-w.patch 0023-alsa-info.sh-Condense-nested-commands-for-file-uploa.patch 0024-alsa-info.sh-Condense-nested-commands-for-formatting.patch 0025-alsa-info.sh-Perform-test-for-wget-earlier.patch 0026-alsa-info.sh-Warn-after-actual-upload-failure-do-not.patch OBS-URL: https://build.opensuse.org/request/show/766332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=165
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From c9dc401264ad3c0b621f52e8098e7c1661c50cea Mon Sep 17 00:00:00 2001
|
|
From: Rosen Penev <rosenp@gmail.com>
|
|
Date: Wed, 20 Nov 2019 11:13:55 -0800
|
|
Subject: [PATCH 05/26] aplay: Limit VUMeter progress bar to 100 for negative
|
|
as well
|
|
|
|
While the progress bar cannot be negative, GCC concludes that it can be
|
|
and assumes tmp can be written past the end. Fixes this GCC warning:
|
|
|
|
aplay.c:1747:18: warning: '%02d' directive writing between 2 and 11 bytes
|
|
into a region of size 4 [-Wformat-overflow=]
|
|
1747 | sprintf(tmp, "%02d%%", maxperc[c]);
|
|
|
|
Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
aplay/aplay.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/aplay/aplay.c b/aplay/aplay.c
|
|
index 78adee2fa380..1a887e412aae 100644
|
|
--- a/aplay/aplay.c
|
|
+++ b/aplay/aplay.c
|
|
@@ -54,6 +54,8 @@
|
|
#include "formats.h"
|
|
#include "version.h"
|
|
|
|
+#define ABS(a) (a) < 0 ? -(a) : (a)
|
|
+
|
|
#ifdef SND_CHMAP_API_VERSION
|
|
#define CONFIG_SUPPORT_CHMAP 1
|
|
#endif
|
|
@@ -1741,7 +1743,7 @@ static void print_vu_meter_stereo(int *perc, int *maxperc)
|
|
line[bar_length + 6 + 1 + p] = '+';
|
|
else
|
|
line[bar_length - p - 1] = '+';
|
|
- if (maxperc[c] > 99)
|
|
+ if (ABS(maxperc[c]) > 99)
|
|
sprintf(tmp, "MAX");
|
|
else
|
|
sprintf(tmp, "%02d%%", maxperc[c]);
|
|
--
|
|
2.16.4
|
|
|