- fix for error with utf8 textinput for buttons

- ensure input is valid utf8 from ghost and NULL then complain if its not.
- added function to get utf8 size BLI_str_utf8_size()

1 files changed, 1 insertions, 3 deletions

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index dc9f003ab1a..942c0d39c37 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -492,9 +492,7 @@ static int rna_Event_unicode_length(PointerRNA *ptr)
 
 	wmEvent *event= (wmEvent*)ptr->data;
 	if (event->utf8_buf[0]) {
-		size_t len= 0;
-		BLI_str_utf8_as_unicode_and_size(event->utf8_buf, &len);
-		return (int)len;
+		return BLI_str_utf8_size(event->utf8_buf); /* invalid value is checked on assignment so we dont need to account for this */
 	}
 	else {
 		return 0;