Takashi Iwai
f936d7ca95
- Backport upstream fixes: various fixes in aplay, alsamixer, alsactl and alsaloop, updated translations, etc: 0001-aplay-try-to-use-16-bit-format-to-increase-capture-q.patch 0002-alsamixer-Fix-the-mixer-views-description-in-man-pag.patch 0003-Add-Slovak-translation.patch 0004-Add-Basque-translation.patch 0006-aplay-cosmetic-code-fix-in-xrun.patch 0007-aplay-fix-the-CPU-busy-loop-in-the-pause-handler.patch 0008-alsa-info-Add-lsusb-and-stream-outputs.patch 0013-aplay-add-test-code-for-snd_pcm_status-to-test-posit.patch 0014-ucm-fix-typo-in-docs.patch 0015-aplay-add-avail-delay-checks-to-test-position.patch 0016-alsactl-daemon-read_pid_file-fix-the-returned-code-o.patch 0017-alsactl-init-set_ctl_value-fix-bytes-parsing.patch 0018-alsactl-init-parse-fix-possible-double-free.patch 0019-alsaloop-fix-possible-memory-leak-in-create_loopback.patch 0020-alsaloop-get_queued_playback_samples-simplify-code.patch 0021-topology-fix-possible-double-free-in-load.patch 0022-alsamixer-remove-dead-fcn-widget_handle_key-in-widge.patch 0023-alsamixer-remove-unused-variable-y-in-display_scroll.patch 0024-alsamixer-fix-shift-in-parse_words.patch 0025-aplay-fix-the-test-position-test-for-playback-avail-.patch OBS-URL: https://build.opensuse.org/request/show/865332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=188
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From 19cc5daef42c84bdadbaa25d1c4e1da33eeae3cc Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 11 Jan 2021 10:44:38 +0100
|
|
Subject: [PATCH 24/25] alsamixer: fix shift in parse_words()
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
alsamixer/configparser.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/alsamixer/configparser.c b/alsamixer/configparser.c
|
|
index 93aa72afd04d..7647987f84d6 100644
|
|
--- a/alsamixer/configparser.c
|
|
+++ b/alsamixer/configparser.c
|
|
@@ -155,7 +155,7 @@ const char *mixer_words =
|
|
static unsigned int parse_words(const char *name, const char* wordlist, unsigned int itemlen, unsigned int *number) {
|
|
unsigned int words = 0;
|
|
unsigned int word;
|
|
- unsigned int i;
|
|
+ int i;
|
|
char buf[16];
|
|
char *endptr;
|
|
|
|
@@ -181,7 +181,7 @@ static unsigned int parse_words(const char *name, const char* wordlist, unsigned
|
|
word = W_NUMBER;
|
|
}
|
|
else if ((i = strlist_index(wordlist, itemlen, buf)) >= 0)
|
|
- word = 2U << i;
|
|
+ word = i <= 30 ? (2U << i) : 0;
|
|
else
|
|
return 0;
|
|
|
|
--
|
|
2.26.2
|
|
|