Takashi Iwai
6ab9f38ea9
- Backport upstream fixes: more topology fixes, a memory leak fix in mixer API, alsactl string handling fix, UCM config fixes: 0032-Update-the-attributes.m4-macro-file-from-xine.patch 0033-topology-avoid-to-use-the-atoi-directly-when-expecte.patch 0034-topology-use-snd_config_get_bool-instead-own-impleme.patch 0035-topology-fix-tplg_get_integer-handle-errno-ERANGE.patch 0036-topology-add-tplg_get_unsigned-function.patch 0037-topology-convert-builder-to-use-the-mallocated-memor.patch 0038-topology-add-binary-output-from-the-builder.patch 0039-topology-parser-recode-tplg_parse_config.patch 0040-topology-add-snd_tplg_load-remove-snd_tplg_build_bin.patch 0041-topology-move-the-topology-element-table-from-builde.patch 0042-topology-add-parser-to-the-tplg_table.patch 0043-topology-add-snd_tplg_save.patch 0044-topology-add-snd_tplg_create-with-flags.patch 0045-topology-add-snd_tplg_version-function.patch 0046-topology-cleanup-the-SNDERR-calls.patch 0047-topology-dapm-fix-the-SNDERR-Undefined.patch 0048-topology-fix-the-unitialized-tuples.patch 0049-topology-implement-shorter-hexa-uuid-00-00-parser.patch 0050-topology-fix-the-TPLG_DEBUG-compilation.patch 0051-topology-fix-the-ops-parser-accept-integer-hexa-valu.patch 0052-topology-fix-the-wrong-memory-access-object-realloc.patch 0053-topology-implement-snd_tplg_decode.patch 0054-topology-move-the-elem-list-delete-to-tplg_elem_free.patch 0055-topology-unify-the-log-mechanism.patch 0056-topology-tplg_dbg-cleanups.patch 0057-topology-cosmetic-changes-functions.patch 0058-mixer-Fix-memory-leak-for-more-than-16-file-descript.patch OBS-URL: https://build.opensuse.org/request/show/766329 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=265
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From cb88813ff71226af5d16f8853d186ff7c572dbe0 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 3 Jan 2020 22:07:11 +0100
|
|
Subject: [PATCH 54/63] topology: move the elem->list delete to
|
|
tplg_elem_free()
|
|
|
|
The tplg_elem_free() is called in the error path from many places
|
|
and it is expected that the element object will be unregistered
|
|
from the tplg structure, too.
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/topology/elem.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/topology/elem.c b/src/topology/elem.c
|
|
index ed5b5f13054f..cbd7f4b636c1 100644
|
|
--- a/src/topology/elem.c
|
|
+++ b/src/topology/elem.c
|
|
@@ -301,6 +301,8 @@ struct tplg_elem *tplg_elem_new(void)
|
|
|
|
void tplg_elem_free(struct tplg_elem *elem)
|
|
{
|
|
+ list_del(&elem->list);
|
|
+
|
|
tplg_ref_free_list(&elem->ref_list);
|
|
|
|
/* free struct snd_tplg_ object,
|
|
@@ -323,7 +325,6 @@ void tplg_elem_free_list(struct list_head *base)
|
|
|
|
list_for_each_safe(pos, npos, base) {
|
|
elem = list_entry(pos, struct tplg_elem, list);
|
|
- list_del(&elem->list);
|
|
tplg_elem_free(elem);
|
|
}
|
|
}
|
|
--
|
|
2.16.4
|
|
|