replace use of strcat() where the string offset is known.

also correct bad logic with converting a textblock to 3d-text, bytes-vs-number of chars wasn't handled right.

4 files changed, 56 insertions, 37 deletions

diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h
index adef843d2cc..db32190494a 100644
--- a/source/blender/blenlib/BLI_string_utf8.h
+++ b/source/blender/blenlib/BLI_string_utf8.h
@@ -31,43 +31,57 @@
 extern "C" {
 #endif
 
-char        *BLI_strncpy_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy);
-char        *BLI_strncat_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy);
-int          BLI_utf8_invalid_byte(const char *str, int length);
-int          BLI_utf8_invalid_strip(char *str, int length);
+#ifdef __GNUC__
+#  define ATTR_NONULL __attribute__((nonnull))
+#  define ATTR_NONULL_FIRST  __attribute__((nonnull(1)))
+#  define ATTR_UNUSED_RESULT __attribute__((warn_unused_result))
+#else
+#  define ATTR_NONULL
+#  define ATTR_NONULL_FIRST
+#  define ATTR_UNUSED_RESULT
+#endif
+
+char        *BLI_strncpy_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy)  ATTR_NONULL;
+char        *BLI_strncat_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy)  ATTR_NONULL;
+int          BLI_utf8_invalid_byte(const char *str, int length)  ATTR_NONULL;
+int          BLI_utf8_invalid_strip(char *str, int length)  ATTR_NONULL;
 
-int          BLI_str_utf8_size(const char *p); /* warning, can return -1 on bad chars */
-int          BLI_str_utf8_size_safe(const char *p);
+int          BLI_str_utf8_size(const char *p)  ATTR_NONULL; /* warning, can return -1 on bad chars */
+int          BLI_str_utf8_size_safe(const char *p)  ATTR_NONULL;
 /* copied from glib */
-unsigned int BLI_str_utf8_as_unicode(const char *p);
-unsigned int BLI_str_utf8_as_unicode_and_size(const char *__restrict p, size_t *__restrict index);
-unsigned int BLI_str_utf8_as_unicode_and_size_safe(const char *__restrict p, size_t *__restrict index);
-unsigned int BLI_str_utf8_as_unicode_step(const char *__restrict p, size_t *__restrict index);
+unsigned int BLI_str_utf8_as_unicode(const char *p)  ATTR_NONULL;
+unsigned int BLI_str_utf8_as_unicode_and_size(const char *__restrict p, size_t *__restrict index)  ATTR_NONULL;
+unsigned int BLI_str_utf8_as_unicode_and_size_safe(const char *__restrict p, size_t *__restrict index)  ATTR_NONULL;
+unsigned int BLI_str_utf8_as_unicode_step(const char *__restrict p, size_t *__restrict index)  ATTR_NONULL;
 size_t       BLI_str_utf8_from_unicode(unsigned int c, char *outbuf);
 
-char        *BLI_str_find_prev_char_utf8(const char *str, const char *p);
-char        *BLI_str_find_next_char_utf8(const char *p, const char *end);
-char        *BLI_str_prev_char_utf8(const char *p);
+char        *BLI_str_find_prev_char_utf8(const char *str, const char *p)  ATTR_NONULL;
+char        *BLI_str_find_next_char_utf8(const char *p, const char *end)  ATTR_NONULL_FIRST;
+char        *BLI_str_prev_char_utf8(const char *p)  ATTR_NONULL;
 
 /* wchar_t functions, copied from blenders own font.c originally */
-size_t       BLI_wstrlen_utf8(const wchar_t *src);
-size_t       BLI_strlen_utf8_ex(const char *strc, int *r_len_bytes);
-size_t       BLI_strlen_utf8(const char *strc);
-size_t       BLI_strnlen_utf8_ex(const char *strc, const size_t maxlen, int *r_len_bytes);
-size_t       BLI_strnlen_utf8(const char *strc, const size_t maxlen);
-size_t       BLI_strncpy_wchar_as_utf8(char *__restrict dst, const wchar_t *__restrict src, const size_t maxcpy);
-size_t       BLI_strncpy_wchar_from_utf8(wchar_t *__restrict dst, const char *__restrict src, const size_t maxcpy);
+size_t       BLI_wstrlen_utf8(const wchar_t *src)  ATTR_NONULL;
+size_t       BLI_strlen_utf8_ex(const char *strc, size_t *r_len_bytes)  ATTR_NONULL;
+size_t       BLI_strlen_utf8(const char *strc)  ATTR_NONULL;
+size_t       BLI_strnlen_utf8_ex(const char *strc, const size_t maxlen, size_t *r_len_bytes)  ATTR_NONULL;
+size_t       BLI_strnlen_utf8(const char *strc, const size_t maxlen)  ATTR_NONULL;
+size_t       BLI_strncpy_wchar_as_utf8(char *__restrict dst, const wchar_t *__restrict src, const size_t maxcpy)  ATTR_NONULL;
+size_t       BLI_strncpy_wchar_from_utf8(wchar_t *__restrict dst, const char *__restrict src, const size_t maxcpy)  ATTR_NONULL;
 
 /* count columns that character/string occupies, based on wcwidth.c */
 int          BLI_wcwidth(wchar_t ucs);
-int          BLI_wcswidth(const wchar_t *pwcs, size_t n);
-int          BLI_str_utf8_char_width(const char *p); /* warning, can return -1 on bad chars */
-int          BLI_str_utf8_char_width_safe(const char *p);
+int          BLI_wcswidth(const wchar_t *pwcs, size_t n)  ATTR_NONULL;
+int          BLI_str_utf8_char_width(const char *p)  ATTR_NONULL; /* warning, can return -1 on bad chars */
+int          BLI_str_utf8_char_width_safe(const char *p)  ATTR_NONULL;
 
 #define      BLI_UTF8_MAX 6        /* mem */
 #define      BLI_UTF8_WIDTH_MAX 2  /* columns */
 #define      BLI_UTF8_ERR ((unsigned int)-1)
 
+#undef ATTR_NONULL
+#undef ATTR_NONULL_FIRST
+#undef ATTR_UNUSED_RESULT
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index c5205ed5d18..762c4845943 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -695,8 +695,10 @@ bool BLI_path_frame(char *path, int frame, int digits)
 
 	if (stringframe_chars(path, &ch_sta, &ch_end)) { /* warning, ch_end is the last # +1 */
 		char tmp[FILE_MAX];
-		sprintf(tmp, "%.*s%.*d%s", ch_sta, path, ch_end - ch_sta, frame, path + ch_end);
-		strcpy(path, tmp);
+		BLI_snprintf(tmp, sizeof(tmp),
+		             "%.*s%.*d%s",
+		             ch_sta, path, ch_end - ch_sta, frame, path + ch_end);
+		BLI_strncpy(path, tmp, FILE_MAX);
 		return true;
 	}
 	return false;
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index cb0d4ae307d..3de57ccb54f 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -87,15 +87,18 @@ char *BLI_strdup(const char *str)
  */
 char *BLI_strdupcat(const char *__restrict str1, const char *__restrict str2)
 {
-	size_t len;
-	char *n;
-	
-	len = strlen(str1) + strlen(str2);
-	n = MEM_mallocN(len + 1, "strdupcat");
-	strcpy(n, str1);
-	strcat(n, str2);
+	/* include the NULL terminator of str2 only */
+	const size_t str1_len = strlen(str1);
+	const size_t str2_len = strlen(str2) + 1;
+	char *str, *s;
 	
-	return n;
+	str = MEM_mallocN(str1_len + str2_len, "strdupcat");
+	s = str;
+
+	memcpy(s, str1, str1_len); s += str1_len;
+	memcpy(s, str2, str2_len);
+
+	return str;
 }
 
 /**
diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c
index d435ed8f6e7..225b3c5538f 100644
--- a/source/blender/blenlib/intern/string_utf8.c
+++ b/source/blender/blenlib/intern/string_utf8.c
@@ -260,7 +260,7 @@ size_t BLI_wstrlen_utf8(const wchar_t *src)
 	return len;
 }
 
-size_t BLI_strlen_utf8_ex(const char *strc, int *r_len_bytes)
+size_t BLI_strlen_utf8_ex(const char *strc, size_t *r_len_bytes)
 {
 	size_t len;
 	const char *strc_orig = strc;
@@ -268,7 +268,7 @@ size_t BLI_strlen_utf8_ex(const char *strc, int *r_len_bytes)
 	for (len = 0; *strc; len++)
 		strc += BLI_str_utf8_size_safe(strc);
 
-	*r_len_bytes = (strc - strc_orig);
+	*r_len_bytes = (size_t)(strc - strc_orig);
 	return len;
 }
 
@@ -282,7 +282,7 @@ size_t BLI_strlen_utf8(const char *strc)
 	return len;
 }
 
-size_t BLI_strnlen_utf8_ex(const char *strc, const size_t maxlen, int *r_len_bytes)
+size_t BLI_strnlen_utf8_ex(const char *strc, const size_t maxlen, size_t *r_len_bytes)
 {
 	size_t len;
 	const char *strc_orig = strc;
@@ -292,7 +292,7 @@ size_t BLI_strnlen_utf8_ex(const char *strc, const size_t maxlen, int *r_len_byt
 		strc += BLI_str_utf8_size_safe(strc);
 	}
 
-	*r_len_bytes = (strc - strc_orig);
+	*r_len_bytes = (size_t)(strc - strc_orig);
 	return len;
 }