mirror of
https://github.com/pybind/pybind11.git
synced 2024-12-01 01:17:10 +00:00
20d6d1d457
* Fix segfault when reloading interpreter with external modules When embedding the interpreter and loading external modules in that embedded interpreter, the external module correctly shares its internals_ptr with the one in the embedded interpreter. When the interpreter is shut down, however, only the `internals_ptr` local to the embedded code is actually reset to nullptr: the external module remains set. The result is that loading an external pybind11 module, letting the interpreter go through a finalize/initialize, then attempting to use something in the external module fails because this external module is still trying to use the old (destroyed) internals. This causes undefined behaviour (typically a segfault). This commit fixes it by adding a level of indirection in the internals path, converting the local internals variable to `internals **` instead of `internals *`. With this change, we can detect a stale internals pointer and reload the internals pointer (either from a capsule or by creating a new internals instance). (No issue number: this was reported on gitter by @henryiii and @aoloe).
42 lines
1.5 KiB
CMake
42 lines
1.5 KiB
CMake
if(${PYTHON_MODULE_EXTENSION} MATCHES "pypy")
|
|
add_custom_target(cpptest) # Dummy target on PyPy. Embedding is not supported.
|
|
set(_suppress_unused_variable_warning "${DOWNLOAD_CATCH}")
|
|
return()
|
|
endif()
|
|
|
|
find_package(Catch 1.9.3)
|
|
if(CATCH_FOUND)
|
|
message(STATUS "Building interpreter tests using Catch v${CATCH_VERSION}")
|
|
else()
|
|
message(STATUS "Catch not detected. Interpreter tests will be skipped. Install Catch headers"
|
|
" manually or use `cmake -DDOWNLOAD_CATCH=1` to fetch them automatically.")
|
|
return()
|
|
endif()
|
|
|
|
add_executable(test_embed
|
|
catch.cpp
|
|
test_interpreter.cpp
|
|
)
|
|
target_include_directories(test_embed PRIVATE ${CATCH_INCLUDE_DIR})
|
|
pybind11_enable_warnings(test_embed)
|
|
|
|
if(NOT CMAKE_VERSION VERSION_LESS 3.0)
|
|
target_link_libraries(test_embed PRIVATE pybind11::embed)
|
|
else()
|
|
target_include_directories(test_embed PRIVATE ${PYBIND11_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS})
|
|
target_compile_options(test_embed PRIVATE ${PYBIND11_CPP_STANDARD})
|
|
target_link_libraries(test_embed PRIVATE ${PYTHON_LIBRARIES})
|
|
endif()
|
|
|
|
find_package(Threads REQUIRED)
|
|
target_link_libraries(test_embed PUBLIC ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
add_custom_target(cpptest COMMAND $<TARGET_FILE:test_embed>
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
|
pybind11_add_module(external_module THIN_LTO external_module.cpp)
|
|
set_target_properties(external_module PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
add_dependencies(cpptest external_module)
|
|
|
|
add_dependencies(check cpptest)
|