[Bf-blender-cvs] [748b800] master: Text3d: add assert's to check the selection and length are valid

Campbell Barton noreply at git.blender.org
Sun Dec 29 13:17:18 CET 2013


Commit: 748b800eba6087ef5adf00382b64247ad929e65d
Author: Campbell Barton
Date:   Sun Dec 29 23:16:02 2013 +1100
https://developer.blender.org/rB748b800eba6087ef5adf00382b64247ad929e65d

Text3d: add assert's to check the selection and length are valid

===================================================================

M	source/blender/blenkernel/intern/font.c
M	source/blender/editors/curve/editfont.c

===================================================================

diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 16ffd0e..6309509 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -463,6 +463,10 @@ int BKE_vfont_select_get(Object *ob, int *start, int *end)
 	
 	if (cu->editfont == NULL || ob->type != OB_FONT) return 0;
 
+	BLI_assert(cu->selstart >= 0 && cu->selstart <= cu->len + 1);
+	BLI_assert(cu->selend   >= 0 && cu->selend   <= cu->len + 1);
+	BLI_assert(cu->pos      >= 0 && cu->pos      <= cu->len);
+
 	if (cu->selstart == 0) return 0;
 	if (cu->selstart <= cu->selend) {
 		*start = cu->selstart - 1;
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 440ded6..d5b6fe8 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -237,6 +237,8 @@ static void update_string(Curve *cu)
 
 	/* Copy the wchar to UTF-8 */
 	BLI_strncpy_wchar_as_utf8(cu->str, ef->textbuf, len + 1);
+
+	BLI_assert(len == cu->len);
 }
 
 static int insert_into_textbuf(Object *obedit, uintptr_t c)




More information about the Bf-blender-cvs mailing list