summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-04-11 16:27:31 +0000
committerLennart Poettering <lennart@poettering.net>2008-04-11 16:27:31 +0000
commit007f82d351a1c40bbfce19c5299ea2d541d0b117 (patch)
tree42941454fb27c876869711571af39928cf9e2db0
parentd491adff74640040b2ae3fba0bd864e1178ba461 (diff)
fix bad memory access when initializing client proplist
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2238 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulse/context.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c
index b9d93083..abc6a855 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -1205,8 +1205,10 @@ void pa_init_proplist(pa_proplist *p) {
}
}
- if (!(a = pa_proplist_contains(p, PA_PROP_APPLICATION_PROCESS_BINARY)) ||
- !(b = pa_proplist_contains(p, PA_PROP_APPLICATION_NAME))) {
+ a = pa_proplist_contains(p, PA_PROP_APPLICATION_PROCESS_BINARY);
+ b = pa_proplist_contains(p, PA_PROP_APPLICATION_NAME);
+
+ if (!a || !b) {
char t[PATH_MAX];
if (pa_get_binary_name(t, sizeof(t))) {
char *c = pa_utf8_filter(t);