From 51bf9ab8eeee82e1bfe2887e0f48673018dcb9cc3cfe5caebf9bc4496b120a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 27 Dec 2011 13:32:45 +0000 Subject: [PATCH] Accepting request 98300 from home:namtrac:bugfix - Fix wrong size argument in memset call OBS-URL: https://build.opensuse.org/request/show/98300 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=79 --- pulseaudio-wrong-memset.patch | 26 ++++++++++++++++++++++++++ pulseaudio.changes | 5 +++++ pulseaudio.spec | 10 +++++----- 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 pulseaudio-wrong-memset.patch diff --git a/pulseaudio-wrong-memset.patch b/pulseaudio-wrong-memset.patch new file mode 100644 index 0000000..bc1d7c8 --- /dev/null +++ b/pulseaudio-wrong-memset.patch @@ -0,0 +1,26 @@ +Index: pulseaudio-1.1/src/modules/rtp/rtp.c +=================================================================== +--- pulseaudio-1.1.orig/src/modules/rtp/rtp.c ++++ pulseaudio-1.1/src/modules/rtp/rtp.c +@@ -286,7 +286,7 @@ int pa_rtp_recv(pa_rtp_context *c, pa_me + + if (!found_tstamp) { + pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!"); +- memset(tstamp, 0, sizeof(tstamp)); ++ memset(tstamp, 0, sizeof(struct timeval)); + } + + return 0; +Index: pulseaudio-1.1/src/modules/echo-cancel/adrian-aec.c +=================================================================== +--- pulseaudio-1.1.orig/src/modules/echo-cancel/adrian-aec.c ++++ pulseaudio-1.1/src/modules/echo-cancel/adrian-aec.c +@@ -163,7 +163,7 @@ static void AEC_leaky(AEC *a) + } else if (1 == a->hangover) { + --(a->hangover); + // My Leaky NLMS is to erase vector w when hangover expires +- memset(a->w, 0, sizeof(a->w)); ++ memset(a->w, 0, sizeof(REAL)); + } + } + } diff --git a/pulseaudio.changes b/pulseaudio.changes index 1be1efd..46de3c2 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:27:22 UTC 2011 - idonmez@suse.com + +- Fix wrong size argument in memset call + ------------------------------------------------------------------- Fri Oct 21 08:17:27 UTC 2011 - wstephenson@suse.com diff --git a/pulseaudio.spec b/pulseaudio.spec index d4fc605..8c47d8f 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -15,16 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: pulseaudio Version: 1.1 -Release: 1 +Release: 0 %define drvver 1.1 -License: GPL-2.0+ ; LGPL-2.1+ Summary: A Networked Sound Server -Url: http://pulseaudio.org +License: GPL-2.0+ ; LGPL-2.1+ Group: System/Sound Daemons +Url: http://pulseaudio.org Source: http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz Source1: default.pa-for-gdm Source2: setup-pulseaudio @@ -32,6 +30,7 @@ Source3: sysconfig.sound-pulseaudio Source99: baselibs.conf Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff +Patch2: pulseaudio-wrong-memset.patch BuildRequires: alsa-devel BuildRequires: bluez-devel BuildRequires: doxygen @@ -252,6 +251,7 @@ This package contains GDM integration hooks for the PulseAudio sound server. translation-update-upstream %patch0 %patch1 -p1 +%patch2 -p1 %build autoreconf