[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/shm.cpp [release_0_7_2]
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/shm.cpp [release_0_7_2] |
Date: |
Fri, 17 Nov 2006 19:01:41 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Sandro Santilli <strk> 06/11/17 19:01:40
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&only_with_tag=release_0_7_2&r1=1.1412.2.181&r2=1.1412.2.182
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.24.2.1&r2=1.24.2.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.181
retrieving revision 1.1412.2.182
diff -u -b -r1.1412.2.181 -r1.1412.2.182
--- ChangeLog 17 Nov 2006 18:54:05 -0000 1.1412.2.181
+++ ChangeLog 17 Nov 2006 19:01:40 -0000 1.1412.2.182
@@ -1,5 +1,7 @@
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: added missing
<unistd.h> and "config.h" includes
Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -b -r1.24.2.1 -r1.24.2.2
--- server/shm.cpp 30 Oct 2006 14:28:49 -0000 1.24.2.1
+++ server/shm.cpp 17 Nov 2006 19:01:40 -0000 1.24.2.2
@@ -18,7 +18,7 @@
//
//
-/* $Id: shm.cpp,v 1.24.2.1 2006/10/30 14:28:49 rsavoye Exp $ */
+/* $Id: shm.cpp,v 1.24.2.2 2006/11/17 19:01:40 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) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/shm.cpp [release_0_7_2],
Sandro Santilli <=