Accepting request 36711 from GNOME:Factory
checked in (request 36711) OBS-URL: https://build.opensuse.org/request/show/36711 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=30
This commit is contained in:
parent
548e7cff87
commit
8bd3e01f28
@ -1,27 +0,0 @@
|
|||||||
From: Michal Schmidt <mschmidt@redhat.com>
|
|
||||||
Date: Tue, 30 Mar 2010 15:50:04 +0000 (+0200)
|
|
||||||
Subject: pulse: fix use after free in stream_drain_cb()
|
|
||||||
X-Git-Url: http://git.0pointer.de/?p=libcanberra.git;a=commitdiff_plain;h=04a2c7cac4ff384880309b950c8201803aa37786
|
|
||||||
|
|
||||||
pulse: fix use after free in stream_drain_cb()
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/src/pulse.c b/src/pulse.c
|
|
||||||
index fcb6b05..d4225d1 100644
|
|
||||||
--- a/src/pulse.c
|
|
||||||
+++ b/src/pulse.c
|
|
||||||
@@ -663,12 +663,12 @@ static void stream_drain_cb(pa_stream *s, int success, void *userdata) {
|
|
||||||
pa_stream_disconnect(s);
|
|
||||||
out->error = err;
|
|
||||||
out->finished = TRUE;
|
|
||||||
- }
|
|
||||||
|
|
||||||
if (out->drain_operation) {
|
|
||||||
pa_operation_unref(out->drain_operation);
|
|
||||||
out->drain_operation = NULL;
|
|
||||||
}
|
|
||||||
+ }
|
|
||||||
|
|
||||||
pa_threaded_mainloop_signal(p->mainloop, FALSE);
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +1,3 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Thu Apr 1 19:49:35 CEST 2010 - vuntz@opensuse.org
|
|
||||||
|
|
||||||
- Add libcanberra-fix-pulse-crash.patch to fix a crash in
|
|
||||||
libcanberra that makes many apps crash. Fix bnc#591729.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Feb 21 16:06:30 CET 2010 - dimstar@opensuse.org
|
Sun Feb 21 16:06:30 CET 2010 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
@ -27,8 +27,6 @@ Group: System/Libraries
|
|||||||
Source: libcanberra-%{version}.tar.bz2
|
Source: libcanberra-%{version}.tar.bz2
|
||||||
Source1: libcanberra-gtk-module.sh
|
Source1: libcanberra-gtk-module.sh
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
# PATCH-FIX-UPSTREAM libcanberra-fix-pulse-crash.patch vuntz@opensuse.org -- Taken from upstream, fix a crash
|
|
||||||
Patch0: libcanberra-fix-pulse-crash.patch
|
|
||||||
BuildRequires: alsa-devel
|
BuildRequires: alsa-devel
|
||||||
BuildRequires: gconf2-devel
|
BuildRequires: gconf2-devel
|
||||||
BuildRequires: gstreamer-0_10-devel
|
BuildRequires: gstreamer-0_10-devel
|
||||||
@ -142,7 +140,6 @@ trigger input feedback event sounds
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-pic --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso
|
%configure --with-pic --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso
|
||||||
|
Loading…
Reference in New Issue
Block a user