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

Add type checks for Python context overrides

Browse Source 
it was too easy to use invalid types which would crash or fail silently.
This commit is contained in:
Campbell Barton
2014-04-22 23:05:58 +10:00
parent bca7d15ce0
commit af84bf2d29
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/blenkernel/intern/context.c
View File

@@ -232,18 +232,31 @@ struct bContextDataResult {
short type; /* 0: normal, 1: seq */
};
static void *ctx_wm_python_context_get(const bContext *C, const char *member, void *fall_through)
static void *ctx_wm_python_context_get(
const bContext *C,
const char *member, const StructRNA *member_type,
void *fall_through)
{
#ifdef WITH_PYTHON
if (UNLIKELY(C && CTX_py_dict_get(C))) {
bContextDataResult result;
memset(&result, 0, sizeof(bContextDataResult));
BPY_context_member_get((bContext *)C, member, &result);
if (result.ptr.data)
return result.ptr.data;
if (result.ptr.data) {
if (RNA_struct_is_a(result.ptr.type, member_type)) {
return result.ptr.data;
}
else {
printf("PyContext '%s' is a '%s', expected a '%s'\n",
member,
RNA_struct_identifier(result.ptr.type),
RNA_struct_identifier(member_type));
}
}
}
#else
(void)C, (void)member;
(void)C, (void)member, (void)member_type;
#endif
/* don't allow UI context access from non-main threads */
@@ -608,17 +621,17 @@ wmWindowManager *CTX_wm_manager(const bContext *C)
wmWindow *CTX_wm_window(const bContext *C)
{
return ctx_wm_python_context_get(C, "window", C->wm.window);
return ctx_wm_python_context_get(C, "window", &RNA_Window, C->wm.window);
}
bScreen *CTX_wm_screen(const bContext *C)
{
return ctx_wm_python_context_get(C, "screen", C->wm.screen);
return ctx_wm_python_context_get(C, "screen", &RNA_Screen, C->wm.screen);
}
ScrArea *CTX_wm_area(const bContext *C)
{
return ctx_wm_python_context_get(C, "area", C->wm.area);
return ctx_wm_python_context_get(C, "area", &RNA_Area, C->wm.area);
}
SpaceLink *CTX_wm_space_data(const bContext *C)
@@ -629,7 +642,7 @@ SpaceLink *CTX_wm_space_data(const bContext *C)
ARegion *CTX_wm_region(const bContext *C)
{
return ctx_wm_python_context_get(C, "region", C->wm.region);
return ctx_wm_python_context_get(C, "region", &RNA_Region, C->wm.region);
}
void *CTX_wm_region_data(const bContext *C)