[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48030] trunk/blender/source/blender/ python/generic/py_capi_utils.c: Fix #31856: movieclips.load(filepath=None) or value crash Blender
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jun 18 14:34:19 CEST 2012
Revision: 48030
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48030
Author: nazgul
Date: 2012-06-18 12:34:19 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Fix #31856: movieclips.load(filepath=None) or value crash Blender
Disallow running PyUnicode_EncodeFSDefault for None type which seems
to be an issue on Windows.
Modified Paths:
--------------
trunk/blender/source/blender/python/generic/py_capi_utils.c
Modified: trunk/blender/source/blender/python/generic/py_capi_utils.c
===================================================================
--- trunk/blender/source/blender/python/generic/py_capi_utils.c 2012-06-18 12:29:44 UTC (rev 48029)
+++ trunk/blender/source/blender/python/generic/py_capi_utils.c 2012-06-18 12:34:19 UTC (rev 48030)
@@ -384,7 +384,10 @@
else {
PyErr_Clear();
- if (PyBytes_Check(py_str)) {
+ if (py_str == Py_None) {
+ return NULL;
+ }
+ else if (PyBytes_Check(py_str)) {
return PyBytes_AS_STRING(py_str);
}
else if ((*coerce = PyUnicode_EncodeFSDefault(py_str))) {
More information about the Bf-blender-cvs
mailing list