Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions Python/remote_debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ _Py_RemoteDebug_ValidatePyRuntimeCookie(proc_handle_t *handle, uintptr_t address
}
char buf[sizeof(_Py_Debug_Cookie) - 1];
if (_Py_RemoteDebug_ReadRemoteMemory(handle, address, sizeof(buf), buf) != 0) {
PyErr_Clear();
if (!PyErr_ExceptionMatches(PyExc_PermissionError)) {
PyErr_Clear();
}
return 0;
}
return memcmp(buf, _Py_Debug_Cookie, sizeof(buf)) == 0;
Expand Down Expand Up @@ -781,6 +783,10 @@ search_linux_map_for_section(proc_handle_t *handle, const char* secname, const c
}

if (strstr(filename, substr)) {
if (PyErr_ExceptionMatches(PyExc_PermissionError)) {
retval = 0;
break;
}
PyErr_Clear();
retval = search_elf_file_for_section(handle, secname, start, path);
if (retval
Expand Down Expand Up @@ -956,12 +962,14 @@ _Py_RemoteDebug_GetPyRuntimeAddress(proc_handle_t* handle)
address = search_linux_map_for_section(handle, "PyRuntime", "python",
_Py_RemoteDebug_ValidatePyRuntimeCookie);
if (address == 0) {
// Error out: 'python' substring covers both executable and DLL
PyObject *exc = PyErr_GetRaisedException();
PyErr_Format(PyExc_RuntimeError,
"Failed to find the PyRuntime section in process %d on Linux platform",
handle->pid);
_PyErr_ChainExceptions1(exc);
if (!PyErr_ExceptionMatches(PyExc_PermissionError)) {
// Error out: 'python' substring covers both executable and DLL
PyObject *exc = PyErr_GetRaisedException();
PyErr_Format(PyExc_RuntimeError,
"Failed to find the PyRuntime section in process %d on Linux platform",
handle->pid);
_PyErr_ChainExceptions1(exc);
}
}
#elif defined(__APPLE__) && defined(TARGET_OS_OSX) && TARGET_OS_OSX
// On macOS, try libpython first, then fall back to python
Expand Down
Loading