Takashi Iwai
1848bd6c60
- Upstream fixes, including the alsa-tools build breakage: 0001-ucm-Use-strncmp-to-avoid-access-out-of-boundary.patch 0002-ucm-return-always-at-least-NULL-if-no-list-is-availa.patch 0003-ucm-add-_identifiers-list.patch 0004-namehint-correct-the-args-check.patch 0005-namehint-improve-the-previous-patch-check-the-return.patch 0006-ucm-docs-allow-spaces-in-device-names-for-JackHWMute.patch 0007-use-case-docs-add-PlaybackMixerCopy-and-CaptureMixer.patch 0008-ucm-docs-add-JackCTL-rearrange-JackControl-and-JackD.patch 0009-ucm-Do-not-fail-to-parse-configs-on-cards-with-an-em.patch 0010-src-ucm-main.c-fix-build-without-mixer.patch 0011-alsa.m4-another-try-to-fix-the-libatopology-detectio.patch 0012-ucm-docs-add-Mic-DigitalMic-and-multiple-devices-com.patch 0013-ucm-docs-remove-DigitalMic-it-does-not-have-sense.patch 0014-ucm-docs-change-the-Mic-description-to-simple-Microp.patch 0015-ucm-docs-add-note-about-the-sequences-and-device-spl.patch 0016-ucm-docs-remove-MixerCopy-values-add-Priority-for-ve.patch 0017-ucm-setup-conf_format-after-getting-ALSA_CONFIG_UCM_.patch 0018-alsa-lib-fix-the-array-parser-unique-compound-keys.patch 0019-topology-remove-vendor_fd-name-from-snd_tplg-structu.patch 0020-topology-file-position-and-size-cleanups.patch 0021-topology-use-an-array-describing-blocks-for-the-main.patch 0022-topology-use-size_t-for-calc_block_size.patch 0023-topology-merge-write_block-to-tplg_write_data.patch 0024-topology-make-vebose-output-more-nice.patch 0025-topology-use-list_insert-macro-in-tplg_elem_insert.patch 0026-topology-dapm-coding-fixes.patch 0027-topology-dapm-merge-identical-index-blocks-like-for-.patch 0028-topology-more-coding-fixes.patch 0029-Fix-alsa-sound-.h-for-external-programs.patch OBS-URL: https://build.opensuse.org/request/show/758564 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=263
88 lines
2.4 KiB
Diff
88 lines
2.4 KiB
Diff
From 9980e18c3c99da42a90a98b140a0ffe7d0f92cd3 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Thu, 12 Dec 2019 18:42:33 +0100
|
|
Subject: [PATCH 18/30] alsa-lib: fix the array parser (unique compound keys)
|
|
|
|
The code from the old import may merge arrays wrongly and
|
|
the result is a compound with same keys like:
|
|
|
|
Input:
|
|
|
|
lines [
|
|
"SSP0.OUT, , BUF1.3"
|
|
]
|
|
lines [
|
|
"BUF2.0, , SSP0.IN"
|
|
]
|
|
|
|
Parsed contents:
|
|
|
|
lines {
|
|
0 'SSP0.OUT, , BUF1.3'
|
|
0 'BUF2.0, , SSP0.IN'
|
|
}
|
|
|
|
Proper parsed contents (create+merge mode):
|
|
|
|
lines {
|
|
0 'SSP0.OUT, , BUF1.3'
|
|
1 'BUF2.0, , SSP0.IN'
|
|
}
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/conf.c | 20 +++++++++++++++++---
|
|
1 file changed, 17 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/conf.c b/src/conf.c
|
|
index e430650430d1..3e753b266b8d 100644
|
|
--- a/src/conf.c
|
|
+++ b/src/conf.c
|
|
@@ -1226,7 +1226,7 @@ static int parse_value(snd_config_t **_n, snd_config_t *parent, input_t *input,
|
|
static int parse_defs(snd_config_t *parent, input_t *input, int skip, int override);
|
|
static int parse_array_defs(snd_config_t *farther, input_t *input, int skip, int override);
|
|
|
|
-static int parse_array_def(snd_config_t *parent, input_t *input, int idx, int skip, int override)
|
|
+static int parse_array_def(snd_config_t *parent, input_t *input, int *idx, int skip, int override)
|
|
{
|
|
char *id = NULL;
|
|
int c;
|
|
@@ -1234,8 +1234,21 @@ static int parse_array_def(snd_config_t *parent, input_t *input, int idx, int sk
|
|
snd_config_t *n = NULL;
|
|
|
|
if (!skip) {
|
|
+ snd_config_t *g;
|
|
char static_id[12];
|
|
- snprintf(static_id, sizeof(static_id), "%i", idx);
|
|
+ while (1) {
|
|
+ snprintf(static_id, sizeof(static_id), "%i", *idx);
|
|
+ if (_snd_config_search(parent, static_id, -1, &g) == 0) {
|
|
+ if (override) {
|
|
+ snd_config_delete(n);
|
|
+ } else {
|
|
+ /* merge */
|
|
+ (*idx)++;
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
id = strdup(static_id);
|
|
if (id == NULL)
|
|
return -ENOMEM;
|
|
@@ -1306,9 +1319,10 @@ static int parse_array_defs(snd_config_t *parent, input_t *input, int skip, int
|
|
unget_char(c, input);
|
|
if (c == ']')
|
|
return 0;
|
|
- err = parse_array_def(parent, input, idx++, skip, override);
|
|
+ err = parse_array_def(parent, input, &idx, skip, override);
|
|
if (err < 0)
|
|
return err;
|
|
+ idx++;
|
|
}
|
|
return 0;
|
|
}
|
|
--
|
|
2.16.4
|
|
|