diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-09-10 17:01:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-10 17:12:11 +0400 |
| commit | 7d9760d96212aebf8bb1fc89f89e248a81ed0d2a (patch) | |
| tree | 909167eb97c1a8be68fc2e8062967a5ea788824c | |
| parent | 3ad902764802b74868d623eea8da460948db2798 (diff) | |
Text3d: assert for <0 len text
also add operator to test blacklist
| -rw-r--r-- | source/blender/blenkernel/intern/font.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/curve/editfont.c | 3 | ||||
| -rw-r--r-- | tests/python/bl_run_operators.py | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 947bd9f4255..8d4bb7ec058 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -488,6 +488,7 @@ int BKE_vfont_select_get(Object *ob, int *r_start, int *r_end) if ((ob->type != OB_FONT) || (ef == NULL)) return 0; + BLI_assert(ef->len >= 0); BLI_assert(ef->selstart >= 0 && ef->selstart <= ef->len + 1); BLI_assert(ef->selend >= 0 && ef->selend <= ef->len); BLI_assert(ef->pos >= 0 && ef->pos <= ef->len); diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index d1f628dd0ea..1449453936f 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -248,6 +248,8 @@ static void text_update_edited(bContext *C, Object *obedit, int mode) Curve *cu = obedit->data; EditFont *ef = cu->editfont; + BLI_assert(ef->len >= 0); + /* run update first since it can move the cursor */ if (mode == FO_EDIT) { /* re-tesselllate */ @@ -1583,6 +1585,7 @@ void make_editText(Object *obedit) len_wchar = BLI_strncpy_wchar_from_utf8(ef->textbuf, cu->str, MAXTEXT + 4); BLI_assert(len_wchar == cu->len_wchar); ef->len = len_wchar; + BLI_assert(ef->len >= 0); memcpy(ef->textbufinfo, cu->strinfo, ef->len * sizeof(CharInfo)); diff --git a/tests/python/bl_run_operators.py b/tests/python/bl_run_operators.py index e14b0ce6d32..f7fafe833aa 100644 --- a/tests/python/bl_run_operators.py +++ b/tests/python/bl_run_operators.py @@ -66,6 +66,7 @@ op_blacklist = ( "wm.doc_edit", "wm.doc_view_manual", "wm.path_open", + "wm.copy_prev_settings", "wm.theme_install", "wm.context_*", "wm.properties_add", |