Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PyAPI: replace checks for invalid input w/ assert

Browse Source 
Was returning -1 as a bool argument,
in this case the caller needs to ensure non-null args.
This commit is contained in:
Campbell Barton
2018-08-31 14:51:59 +10:00
parent 98800aa4e0
commit 976f14fbcf
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/python/intern/bpy_interface.c
View File

@@ -625,13 +625,10 @@ bool BPY_execute_string_as_number(bContext *C, const char *expr, const bool verb
*/ */
bool BPY_execute_string_as_string(bContext *C, const char *expr, const bool verbose, char **r_value) bool BPY_execute_string_as_string(bContext *C, const char *expr, const bool verbose, char **r_value)
{ {
BLI_assert(r_value && expr);
PyGILState_STATE gilstate; PyGILState_STATE gilstate;
bool ok = true; bool ok = true;
if (!r_value || !expr) {
return -1;
}
if (expr[0] == '\0') { if (expr[0] == '\0') {
*r_value = NULL; *r_value = NULL;
return ok; return ok;
@@ -662,13 +659,10 @@ bool BPY_execute_string_as_string(bContext *C, const char *expr, const bool verb
*/ */
bool BPY_execute_string_as_intptr(bContext *C, const char *expr, const bool verbose, intptr_t *r_value) bool BPY_execute_string_as_intptr(bContext *C, const char *expr, const bool verbose, intptr_t *r_value)
{ {
BLI_assert(r_value && expr);
PyGILState_STATE gilstate; PyGILState_STATE gilstate;
bool ok = true; bool ok = true;
if (!r_value || !expr) {
return -1;
}
if (expr[0] == '\0') { if (expr[0] == '\0') {
*r_value = 0; *r_value = 0;
return ok; return ok;
@@ -694,14 +688,13 @@ bool BPY_execute_string_as_intptr(bContext *C, const char *expr, const bool verb
bool BPY_execute_string_ex(bContext *C, const char *expr, bool use_eval) bool BPY_execute_string_ex(bContext *C, const char *expr, bool use_eval)
{ {
BLI_assert(expr);
PyGILState_STATE gilstate; PyGILState_STATE gilstate;
PyObject *main_mod = NULL; PyObject *main_mod = NULL;
PyObject *py_dict, *retval; PyObject *py_dict, *retval;
bool ok = true; bool ok = true;
Main *bmain_back; /* XXX, quick fix for release (Copy Settings crash), needs further investigation */ Main *bmain_back; /* XXX, quick fix for release (Copy Settings crash), needs further investigation */
if (!expr) return -1;
if (expr[0] == '\0') { if (expr[0] == '\0') {
return ok; return ok;
} }