Takashi Iwai
197f321105
- Backport upstream fixes: a PCM plugin regression fix about snd_pcm_status() call, plugin directory handling fixes, missing audio timestamp types, use-after-free fix for conf parser, PCM plugin delay account fixes, etc: 0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch 0002-dlmisc-fix-snd_plugin_dir-locking-for-not-DL_ORIGIN_.patch 0003-pcm-snd_pcm_mmap_readi-fix-typo-in-comment.patch 0007-pcm-set-the-snd_pcm_ioplug_status-tstamp-field.patch 0009-pcm-Add-snd_pcm_audio_tstamp_type_t-constants.patch 0010-test-audio_time-Make-use-of-SND_PCM_AUDIO_TSTAMP_TYP.patch 0011-pcm-Fix-a-typo-in-SND_PCM_AUDIO_TSTAMP_TYPE_LAST-def.patch 0012-conf-fix-use-after-free-in-_snd_config_load_with_inc.patch 0013-ucm-fix-bad-frees-in-get_list0-and-get_list20.patch 0014-rawmidi-fix-memory-leak-in-snd_rawmidi_virtual_open.patch 0015-timer-fix-sizeof-operator-mismatch-in-snd_timer_quer.patch 0016-pcm-remove-dead-assignments-from-snd_pcm_rate_-commi.patch 0017-pcm_multi-remove-dead-assignment-from-_snd_pcm_multi.patch 0018-conf-fix-get_hexachar-return-value.patch 0019-pcm-fix-__snd_pcm_state-return-value.patch 0020-confmisc-fix-memory-leak-in-snd_func_concat.patch 0021-conf-fix-return-code-in-_snd_config_load_with_includ.patch 0022-pcm-plugin-status-fix-the-return-value-regression.patch 0023-pcm-plugin-status-revert-the-recent-changes.patch 0024-pcm-plugin-tidy-snd_pcm_plugin_avail_update.patch 0025-pcm-plugin-optimize-sync-in-snd_pcm_plugin_status.patch 0026-Revert-pcm_plugin-fix-delay.patch 0027-pcm-ioplug-fix-the-delay-calculation-in-the-status-c.patch 0028-pcm-rate-tidy-up-snd_pcm_rate_avail_update.patch 0029-pcm-ioplug-fix-the-delay-calculation-for-old-plugins.patch OBS-URL: https://build.opensuse.org/request/show/860483 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=290
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From 1d993b37ab4e0b9b6e6b795d7be84ce97b29e20b Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Thu, 29 Oct 2020 20:31:19 +0100
|
|
Subject: [PATCH 02/33] dlmisc: fix snd_plugin_dir locking for not
|
|
DL_ORIGIN_AVAILABLE
|
|
|
|
Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/dlmisc.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/src/dlmisc.c b/src/dlmisc.c
|
|
index f20eb59373cf..1dd9135641c1 100644
|
|
--- a/src/dlmisc.c
|
|
+++ b/src/dlmisc.c
|
|
@@ -46,7 +46,7 @@ static int snd_plugin_dir_set = 0;
|
|
static char *snd_plugin_dir = NULL;
|
|
#endif
|
|
|
|
-#if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
|
|
+#ifdef HAVE_LIBPTHREAD
|
|
static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
static inline void snd_dlpath_lock(void)
|
|
@@ -440,12 +440,10 @@ void snd_dlobj_cache_cleanup(void)
|
|
free(c);
|
|
}
|
|
snd_dlobj_unlock();
|
|
-#ifdef DL_ORIGIN_AVAILABLE
|
|
snd_dlpath_lock();
|
|
snd_plugin_dir_set = 0;
|
|
free(snd_plugin_dir);
|
|
snd_plugin_dir = NULL;
|
|
snd_dlpath_unlock();
|
|
-#endif
|
|
}
|
|
#endif
|
|
--
|
|
2.26.2
|
|
|