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
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From e55534d8a5f05a6650d3147867bbcb7bb70e64cd Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 8 Jan 2021 18:15:43 +0100
|
|
Subject: [PATCH 17/25] alsactl: init - set_ctl_value() - fix bytes parsing
|
|
|
|
Use the correct error value handling from hextodigit().
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
alsactl/init_parse.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/alsactl/init_parse.c b/alsactl/init_parse.c
|
|
index ee9cc6d8f1b1..58b46f42de4b 100644
|
|
--- a/alsactl/init_parse.c
|
|
+++ b/alsactl/init_parse.c
|
|
@@ -465,12 +465,13 @@ static int set_ctl_value(struct space *space, const char *value, int all)
|
|
return -EINVAL;
|
|
}
|
|
for (idx = 0; idx < count; idx += 2) {
|
|
- val = hextodigit(*(value++)) << 4;
|
|
- val |= hextodigit(*(value++));
|
|
- if (val > 255) {
|
|
+ int nibble1 = hextodigit(*(value++));
|
|
+ int nibble2 = hextodigit(*(value++));
|
|
+ if (nibble1 < 0 || nibble2 < 0) {
|
|
Perror(space, "bad ctl hexa value");
|
|
return -EINVAL;
|
|
}
|
|
+ val = (nibble1 << 4) | nibble2;
|
|
snd_ctl_elem_value_set_byte(space->ctl_value, idx, val);
|
|
}
|
|
break;
|
|
--
|
|
2.26.2
|
|
|