aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2012-11-22 17:42:13 +0000
committerJuergen Lock <nox@FreeBSD.org>2012-11-22 17:42:13 +0000
commit20fba251604007e607c92e9a1b4dcba2082c98be (patch)
tree37eef2a0efcca2683a2a2c714fc3b84282f2251a
parentdaa172bbf5a88bdb31dc2ec19139a71d099f5ec7 (diff)
downloadports-20fba251604007e607c92e9a1b4dcba2082c98be.tar.gz
ports-20fba251604007e607c92e9a1b4dcba2082c98be.zip
MFH 307524:
- Fix pulseaudio segfault. [1] - No PORTREVISION bump as PULSEAUDIO isn't a default option. Reported by: Rainer Hurling <rhurlin@gwdg.de> on -multimedia [1] Feature safe: yes Approved by: portmgr (beat)
Notes
Notes: svn path=/branches/RELENG_9_1_0/; revision=307658
-rw-r--r--multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c b/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c
new file mode 100644
index 000000000000..505438bfa1f0
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c
@@ -0,0 +1,32 @@
+--- modules/audio_output/vlcpulse.c.orig
++++ modules/audio_output/vlcpulse.c
+@@ -113,10 +113,12 @@ pa_context *vlc_pa_connect (vlc_object_t
+ struct passwd pwbuf, *pw;
+ char buf[len];
+
+- if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0
+- && pw != NULL)
+- pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_USER,
+- pw->pw_name);
++ if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0) {
++ if (pw != NULL)
++ pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_USER,
++ pw->pw_name);
++ break;
++ }
+ }
+
+ for (size_t max = sysconf (_SC_HOST_NAME_MAX), len = max % 1024 + 1024;
+@@ -124,9 +126,11 @@ pa_context *vlc_pa_connect (vlc_object_t
+ {
+ char hostname[len];
+
+- if (gethostname (hostname, sizeof (hostname)) == 0)
++ if (gethostname (hostname, sizeof (hostname)) == 0) {
+ pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_HOST,
+ hostname);
++ break;
++ }
+ }
+
+ const char *session = getenv ("XDG_SESSION_COOKIE");