[Gnash-commit] gnash ChangeLog server/shm.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/17 19:02:20

Modified files:
        .              : ChangeLog 
        server         : shm.cpp 

Log message:
        * server/shm.cpp (Shm::attach): don't use PROT_EXEC to mmap call 
(permission denied on some systems)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1655&r2=1.1656
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1655
retrieving revision 1.1656
diff -u -b -r1.1655 -r1.1656
--- ChangeLog   17 Nov 2006 18:55:56 -0000      1.1655
+++ ChangeLog   17 Nov 2006 19:02:20 -0000      1.1656
@@ -1,5 +1,7 @@
- 2006-11-17 Sandro Santilli <address@hidden>
+2006-11-17 Sandro Santilli <address@hidden>
   
+       * server/shm.cpp (Shm::attach): don't use PROT_EXEC to 
+         mmap call (permission denied on some systems)
        * server/parser/movie_def_impl.{cpp,h}:
 
 2006-11-17 Sandro Santilli <address@hidden>

Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/shm.cpp      29 Oct 2006 18:34:11 -0000      1.25
+++ server/shm.cpp      17 Nov 2006 19:02:20 -0000      1.26
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: shm.cpp,v 1.25 2006/10/29 18:34:11 rsavoye Exp $ */
+/* $Id: shm.cpp,v 1.26 2006/11/17 19:02:20 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -196,7 +196,7 @@
            ftruncate(_shmfd, _size);
        }
        _addr = static_cast<char *>(mmap(0, _size,
-                                PROT_READ|PROT_WRITE|PROT_EXEC,
+                                PROT_READ|PROT_WRITE,
                                         
MAP_SHARED|MAP_INHERIT|MAP_HASSEMAPHORE,
                                 _shmfd, 0));
        if (_addr == MAP_FAILED) {
@@ -241,13 +241,13 @@
            log_msg("Unmapped address %p\n", _addr);
 #ifdef darwin
            _addr = static_cast<char *>(mmap(reinterpret_cast<char *>(addr),
-                                            _size, PROT_READ|PROT_WRITE,
+                                            _size, PROT_READ,
                                             
MAP_SHARED|MAP_FIXED|MAP_INHERIT|MAP_HASSEMAPHORE,
                                             _shmfd, static_cast<off_t>(0)));
 #else
            //                 off = (off_t)((long)addr - (long)_addr);
            _addr = static_cast<char *>(mmap((char *)addr,
-                                            _size, 
PROT_READ|PROT_WRITE|PROT_EXEC,
+                                            _size, PROT_READ|PROT_WRITE,
                                             MAP_FIXED|MAP_SHARED, _shmfd, 0));
 #endif
            if (_addr == MAP_FAILED) {