ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "make libacc run with execute stack protections enabled." into kraken

Browse source
This commit is contained in:
Nick Kralevich 2010-04-26 08:55:41 -07:00 • committed by Android (Google) Code Review
commit 8e274f3476
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libacc/acc.cpp
View file

@ -23,10 +23,7 @@
#include <cutils/hashmap.h>
#if defined(__i386__)
#include <sys/mman.h>
#endif
#if defined(__arm__)
#define DEFAULT_ARM_CODEGEN
@ -230,7 +227,7 @@ class Compiler : public ErrorSink {
void release() {
if (pProgramBase != 0) {
free(pProgramBase);
munmap(pProgramBase, mSize);
pProgramBase = 0;
}
}
@ -263,7 +260,9 @@ class Compiler : public ErrorSink {
virtual void init(int size) {
release();
mSize = size;
pProgramBase = (char*) calloc(1, size);
pProgramBase = (char*) mmap(NULL, size,
PROT_EXEC | PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
ind = pProgramBase;
}