[Bf-blender-cvs] [820d50d3cbf] master: Correct error in 38630711a02e553f209ace9a8627a7a851820a2d
Campbell Barton
noreply at git.blender.org
Wed Aug 25 07:37:06 CEST 2021
Commit: 820d50d3cbf3a3995ca5a4051c82e8ee24805796
Author: Campbell Barton
Date: Wed Aug 25 15:36:40 2021 +1000
Branches: master
https://developer.blender.org/rB820d50d3cbf3a3995ca5a4051c82e8ee24805796
Correct error in 38630711a02e553f209ace9a8627a7a851820a2d
===================================================================
M source/blender/blenlib/intern/string_utf8.c
===================================================================
diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c
index 7a01077bb44..cc6a192f6ba 100644
--- a/source/blender/blenlib/intern/string_utf8.c
+++ b/source/blender/blenlib/intern/string_utf8.c
@@ -678,7 +678,7 @@ size_t BLI_str_utf8_as_utf32(char32_t *__restrict dst_w,
const size_t src_c_len = strlen(src_c);
const char *src_c_end = src_c + src_c_len;
size_t index = 0;
- while (*src_c && len != maxlen) {
+ while ((index < src_c_len) && (len != maxlen)) {
const uint unicode = BLI_str_utf8_as_unicode_step_or_error(src_c, src_c_len, &index);
if (unicode != BLI_UTF8_ERR) {
*dst_w = unicode;
More information about the Bf-blender-cvs
mailing list