Merge remote-tracking branch 'origin/blender-v3.1-release'

2022-02-14 11:09:34 +01:00
parent 48e2bf3638 e0fd31f083
commit 777953f36b
1 changed files with 6 additions and 0 deletions
--- a/source/blender/python/generic/idprop_py_ui_api.c
+++ b/source/blender/python/generic/idprop_py_ui_api.c
@@ -35,6 +35,12 @@

 static bool args_contain_key(PyObject *kwargs, const char *name)
 {
+  if (kwargs == NULL) {
+    /* When a function gets called without any kwargs, Python just passes NULL instead.
+     * PyDict_Contains() is not NULL-safe, though. */
+    return false;
+  }
+
  PyObject *py_key = PyUnicode_FromString(name);
  const bool result = PyDict_Contains(kwargs, py_key) == 1;
  Py_DECREF(py_key);