Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-31 23:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

unpacking_collector: allow nullptr-valued kwargs argument

Browse Source 
This fixes an issue that can arise when forwarding (*args, **kwargs)
captured from a pybind11-bound function call to another Python function.
When the initial function call includes no keyword arguments, the
py::kwargs field is set to nullptr and causes a crash later on.
This commit is contained in:
Wenzel Jakob 2016-10-08 15:30:00 +02:00
parent ba7678016c
commit e71ab8f455
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/pybind11/cast.h
View File

@ -1218,10 +1218,9 @@ private:
} }
void process(list &args_list, detail::args_proxy ap) { void process(list &args_list, detail::args_proxy ap) {
for (const auto &a : ap) { for (const auto &a : ap)
args_list.append(a); args_list.append(a);
} }
}
void process(list &/*args_list*/, arg_v a) { void process(list &/*args_list*/, arg_v a) {
if (m_kwargs.contains(a.name)) { if (m_kwargs.contains(a.name)) {
@ -1242,6 +1241,8 @@ private:
} }
void process(list &/*args_list*/, detail::kwargs_proxy kp) { void process(list &/*args_list*/, detail::kwargs_proxy kp) {
if (!kp)
return;
for (const auto &k : dict(kp, true)) { for (const auto &k : dict(kp, true)) {
if (m_kwargs.contains(k.first)) { if (m_kwargs.contains(k.first)) {
#if defined(NDEBUG) #if defined(NDEBUG)