pool/alsa-plugins
SHA256
20
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 644272 from home:tiwai:branches:multimedia:libs

Browse Source 
- Backport of yet another regression fixes in upstream:
  0005-Revert-jack-Fix-leaks-when-jack_set_hw_constraint-fa.patch
  0006-Revert-usb_stream-Fix-leaks-when-us_set_hw_constrain.patch
  0007-Revert-oss-Fix-leaks-when-oss_hw_constraint-fails.patch

OBS-URL: https://build.opensuse.org/request/show/644272
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-plugins?expand=0&rev=113
This commit is contained in:
Ismail Dönmez
2018-10-24 12:19:14 +00:00
committed by Git OBS Bridge
parent 911d3d50bb
commit 5ee9591363
5 changed files with 102 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alsa-plugins.changes
+8
View File
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Oct 24 14:07:24 CEST 2018 - tiwai@suse.de
- Backport of yet another regression fixes in upstream:
0005-Revert-jack-Fix-leaks-when-jack_set_hw_constraint-fa.patch
0006-Revert-usb_stream-Fix-leaks-when-us_set_hw_constrain.patch
0007-Revert-oss-Fix-leaks-when-oss_hw_constraint-fails.patch
-------------------------------------------------------------------
Wed Oct 24 09:43:57 CEST 2018 - tiwai@suse.de
alsa-plugins.spec
+6
View File
@@ -38,6 +38,9 @@ Patch1: 0001-pcm_usb_stream-fix-another-leak-in-snd_pcm_us_open.patch
Patch2: 0002-pcm_usb_stream-remove-unused-parameter-in-snd_pcm_us.patch
Patch3: 0003-pcm_usb_stream-fix-signess-issues.patch
Patch4: 0004-a52_close-set-slave-to-NULL-to-avoid-double-pcm-free.patch
Patch5: 0005-Revert-jack-Fix-leaks-when-jack_set_hw_constraint-fa.patch
Patch6: 0006-Revert-usb_stream-Fix-leaks-when-us_set_hw_constrain.patch
Patch7: 0007-Revert-oss-Fix-leaks-when-oss_hw_constraint-fails.patch
BuildRequires: alsa-devel
BuildRequires: dbus-1-devel
%if %build_avcodec
@@ -152,6 +155,9 @@ library using libavcodec.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
export AUTOMAKE_JOBS="%{?_smp_mflags}"
0005-Revert-jack-Fix-leaks-when-jack_set_hw_constraint-fa.patch
+30
View File
@@ -0,0 +1,30 @@
From a244a37076cec8c7a65b844e334518c393fbdc5b Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 24 Oct 2018 12:18:42 +0200
Subject: [PATCH 5/7] Revert "jack: Fix leaks when jack_set_hw_constraint()
fails"
This reverts commit f4746667a4a2490f17c2a82b6f421bc3c9bd6de8.
snd_pcm_ioplug_delete() already calls snd_pcm_close()!
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
jack/pcm_jack.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c
index 6aaecac8361f..b39835e7c523 100644
--- a/jack/pcm_jack.c
+++ b/jack/pcm_jack.c
@@ -538,7 +538,6 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
err = jack_set_hw_constraint(jack);
if (err < 0) {
snd_pcm_ioplug_delete(&jack->io);
- snd_pcm_jack_free(jack);
return err;
}
--
2.19.1
0006-Revert-usb_stream-Fix-leaks-when-us_set_hw_constrain.patch
+30
View File
@@ -0,0 +1,30 @@
From 434c83d5c422dd4367711e08b3538e366fcc469e Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 24 Oct 2018 12:23:11 +0200
Subject: [PATCH 6/7] Revert "usb_stream: Fix leaks when us_set_hw_constraint()
fails"
This reverts commit 6b996865126dd559ef186002e45dc6e1594291e7.
snd_pcm_ioplug_delete() already calls snd_pcm_close()!
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
usb_stream/pcm_usb_stream.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c
index 3f74abad5471..2a93d1f6cae2 100644
--- a/usb_stream/pcm_usb_stream.c
+++ b/usb_stream/pcm_usb_stream.c
@@ -456,7 +456,6 @@ static int snd_pcm_us_open(snd_pcm_t **pcmp, const char *name,
err = us_set_hw_constraint(us);
if (err < 0) {
snd_pcm_ioplug_delete(&us->io);
- us_free(us);
return err;
}
--
2.19.1
0007-Revert-oss-Fix-leaks-when-oss_hw_constraint-fails.patch
+28
View File
@@ -0,0 +1,28 @@
From 7dfd3c4fe073319f21192c89a44c16f8b68af3ad Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 24 Oct 2018 12:27:16 +0200
Subject: [PATCH 7/7] Revert "oss: Fix leaks when oss_hw_constraint() fails"
This reverts commit b8bcd458b79146547fc6dae1645832695545da44.
snd_pcm_ioplug_delete() already calls snd_pcm_close()!
---
oss/pcm_oss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oss/pcm_oss.c b/oss/pcm_oss.c
index 8ab4fb01d37b..dadbb5bc8032 100644
--- a/oss/pcm_oss.c
+++ b/oss/pcm_oss.c
@@ -413,7 +413,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss)
if ((err = oss_hw_constraint(oss)) < 0) {
snd_pcm_ioplug_delete(&oss->io);
- goto error;
+ return err;
}
*pcmp = oss->io.pcm;
--
2.19.1