[pulseaudio-commits] Branch 'next' - src/pulsecore

[Tanu Kaskinen]

 src/pulsecore/shm.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bb541aac2a4a4dc2631484a65820fe5c1f86649d
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Tue Apr 9 11:32:20 2013 +0300

    shm: Don't force the shm files to be read-only
    
    Forcing the shm file to be read-only makes shm_unlink() fail on OS X.
    Thanks to Albert Zeyer for reporting the bug and investigating the
    root cause.
    
    BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=62988

diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
index 9f44df3..8aa34fa 100644
--- a/src/pulsecore/shm.c
+++ b/src/pulsecore/shm.c
@@ -111,6 +111,7 @@ int pa_shm_create_rw(pa_shm *m, size_t size, pa_bool_t shared, mode_t mode) {
     pa_assert(m);
     pa_assert(size > 0);
     pa_assert(size <= MAX_SHM_SIZE);
+    pa_assert(!(mode & ~0777));
     pa_assert(mode >= 0600);
 
     /* Each time we create a new SHM area, let's first drop all stale
@@ -151,7 +152,7 @@ int pa_shm_create_rw(pa_shm *m, size_t size, pa_bool_t shared, mode_t mode) {
         pa_random(&m->id, sizeof(m->id));
         segment_name(fn, sizeof(fn), m->id);
 
-        if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) {
+        if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode)) < 0) {
             pa_log("shm_open() failed: %s", pa_cstrerror(errno));
             goto fail;
         }