diff --git a/Misc/NEWS b/Misc/NEWS index 6c2c38fc17b..cc635214119 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -26,6 +26,9 @@ Core and Builtins Library ------- +- Issue5504 - ctypes should now work with systems where mmap can't be + PROT_WRITE and PROT_EXEC. + - Fix Issue8280 - urllib2's Request method will remove fragements in the url. This is how it is supposed to work, wget and curl do the same. Previous behavior was wrong. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index af3bb5b9627..7d7d58cb6e4 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3463,7 +3463,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) self->callable = callable; self->thunk = thunk; - *(void **)self->b_ptr = (void *)thunk->pcl; + *(void **)self->b_ptr = (void *)thunk->pcl_exec; Py_INCREF((PyObject *)thunk); /* for KeepRef */ if (-1 == KeepRef((CDataObject *)self, 0, (PyObject *)thunk)) { diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index 8fbe6dea457..deedaa369d9 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -21,8 +21,8 @@ CThunkObject_dealloc(PyObject *_self) Py_XDECREF(self->converters); Py_XDECREF(self->callable); Py_XDECREF(self->restype); - if (self->pcl) - _ctypes_free_closure(self->pcl); + if (self->pcl_write) + ffi_closure_free(self->pcl_write); PyObject_GC_Del(self); } @@ -391,7 +391,8 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs) return NULL; } - p->pcl = NULL; + p->pcl_exec = NULL; + p->pcl_write = NULL; memset(&p->cif, 0, sizeof(p->cif)); p->converters = NULL; p->callable = NULL; @@ -421,8 +422,9 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable, assert(CThunk_CheckExact(p)); - p->pcl = _ctypes_alloc_closure(); - if (p->pcl == NULL) { + p->pcl_write = ffi_closure_alloc(sizeof(ffi_closure), + &p->pcl_exec); + if (p->pcl_write == NULL) { PyErr_NoMemory(); goto error; } @@ -467,7 +469,9 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable, "ffi_prep_cif failed with %d", result); goto error; } - result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); + result = ffi_prep_closure_loc(p->pcl_write, &p->cif, closure_fcn, + p, + p->pcl_exec); if (result != FFI_OK) { PyErr_Format(PyExc_RuntimeError, "ffi_prep_closure failed with %d", result); diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h index 7d7ba1f37a5..59640ccd580 100644 --- a/Modules/_ctypes/ctypes.h +++ b/Modules/_ctypes/ctypes.h @@ -95,7 +95,8 @@ struct tagCDataObject { typedef struct { PyObject_VAR_HEAD - ffi_closure *pcl; /* the C callable */ + ffi_closure *pcl_write; /* the C callable, writeable */ + void *pcl_exec; /* the C callable, executable */ ffi_cif cif; int flags; PyObject *converters; @@ -428,9 +429,6 @@ extern Py_ssize_t PyUnicode_AsWideChar_fixed(PyUnicodeObject *, wchar_t *, Py_ss #endif #endif -extern void _ctypes_free_closure(void *); -extern void *_ctypes_alloc_closure(void); - extern void _ctypes_add_traceback(char *, char *, int); extern PyObject *PyCData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr); diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in index b7bae9ccb57..27c971f86f2 100644 --- a/Modules/_ctypes/libffi/fficonfig.py.in +++ b/Modules/_ctypes/libffi/fficonfig.py.in @@ -1,5 +1,7 @@ ffi_sources = """ src/prep_cif.c +src/closures.c +src/dlmalloc.c """.split() ffi_platforms = { diff --git a/Modules/_ctypes/libffi_msvc/ffi.c b/Modules/_ctypes/libffi_msvc/ffi.c index 763d179c8b9..65581a773fa 100644 --- a/Modules/_ctypes/libffi_msvc/ffi.c +++ b/Modules/_ctypes/libffi_msvc/ffi.c @@ -371,10 +371,11 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, extern void ffi_closure_OUTER(); ffi_status -ffi_prep_closure (ffi_closure* closure, - ffi_cif* cif, - void (*fun)(ffi_cif*,void*,void**,void*), - void *user_data) +ffi_prep_closure_loc (ffi_closure* closure, + ffi_cif* cif, + void (*fun)(ffi_cif*,void*,void**,void*), + void *user_data, + void *codeloc) { short bytes; char *tramp; @@ -452,6 +453,5 @@ ffi_prep_closure (ffi_closure* closure, closure->cif = cif; closure->user_data = user_data; closure->fun = fun; - return FFI_OK; } diff --git a/Modules/_ctypes/libffi_msvc/ffi.h b/Modules/_ctypes/libffi_msvc/ffi.h index a88d8744f7f..efb14c5f6f3 100644 --- a/Modules/_ctypes/libffi_msvc/ffi.h +++ b/Modules/_ctypes/libffi_msvc/ffi.h @@ -221,11 +221,15 @@ typedef struct { void *user_data; } ffi_closure; +void ffi_closure_free(void *); +void *ffi_closure_alloc (size_t size, void **code); + ffi_status -ffi_prep_closure (ffi_closure*, +ffi_prep_closure_loc (ffi_closure*, ffi_cif *, void (*fun)(ffi_cif*,void*,void**,void*), - void *user_data); + void *user_data, + void *codeloc); typedef struct { char tramp[FFI_TRAMPOLINE_SIZE]; diff --git a/Modules/_ctypes/malloc_closure.c b/Modules/_ctypes/malloc_closure.c index a691ab4f68a..d0a20b567ed 100644 --- a/Modules/_ctypes/malloc_closure.c +++ b/Modules/_ctypes/malloc_closure.c @@ -93,7 +93,7 @@ static void more_core(void) /******************************************************************/ /* put the item back into the free list */ -void _ctypes_free_closure(void *p) +void ffi_closure_free(void *p) { ITEM *item = (ITEM *)p; item->next = free_list; @@ -101,7 +101,7 @@ void _ctypes_free_closure(void *p) } /* return one item from the free list, allocating more if needed */ -void *_ctypes_alloc_closure(void) +void *ffi_closure_alloc(size_t ignored, void** codeloc) { ITEM *item; if (!free_list) @@ -110,5 +110,7 @@ void *_ctypes_alloc_closure(void) return NULL; item = free_list; free_list = item->next; - return item; + *codeloc = (void *)item; + return (void *)item; } + diff --git a/setup.py b/setup.py index a363509fbdb..7d5d30c2cbc 100644 --- a/setup.py +++ b/setup.py @@ -1867,8 +1867,7 @@ class PyBuildExt(build_ext): '_ctypes/callbacks.c', '_ctypes/callproc.c', '_ctypes/stgdict.c', - '_ctypes/cfield.c', - '_ctypes/malloc_closure.c'] + '_ctypes/cfield.c'] depends = ['_ctypes/ctypes.h'] if sys.platform == 'darwin':