archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for crash when running a python script in a non utf8 blend path, inspecting the exception for the path assumed utf8.

Browse Source
This commit is contained in:
Campbell Barton
2011-08-26 17:55:03 +00:00
parent 1439ddccae
commit 8a619a3eee
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/python/intern/bpy_traceback.c
View File

@@ -30,9 +30,9 @@
#include "bpy_traceback.h"
static const char *traceback_filepath(PyTracebackObject *tb)
static const char *traceback_filepath(PyTracebackObject *tb, PyObject **coerce)
{
return _PyUnicode_AsString(tb->tb_frame->f_code->co_filename);
return PyBytes_AS_STRING((*coerce= PyUnicode_EncodeFSDefault(tb->tb_frame->f_code->co_filename)));
}
/* copied from pythonrun.c, 3.2.0 */
@@ -146,7 +146,12 @@ void python_script_error_jump(const char *filepath, int *lineno, int *offset)
PyErr_Print();
for(tb= (PyTracebackObject *)PySys_GetObject("last_traceback"); tb && (PyObject *)tb != Py_None; tb= tb->tb_next) {
if(strcmp(traceback_filepath(tb), filepath) != 0) {
PyObject *coerce;
const char *tb_filepath= traceback_filepath(tb, &coerce);
const int match= strcmp(tb_filepath, filepath) != 0;
Py_DECREF(coerce);
if(match) {
*lineno= tb->tb_lineno;
break;
}