Merge remote-tracking branch 'origin/blender-v3.1-release'

2022-02-18 16:36:45 +01:00
parent 734c6a4405 1b47d07d76
commit 48b17da1d9
1 changed files with 2 additions and 1 deletions
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -307,8 +307,9 @@ size_t BLI_str_unescape_ex(char *__restrict dst,
 {
  size_t len = 0;
  bool is_complete = true;
+  const size_t max_strlen = dst_maxncpy - 1; /* Account for trailing zero byte. */
  for (const char *src_end = src + src_maxncpy; (src < src_end) && *src; src++) {
-    if (UNLIKELY(len == dst_maxncpy)) {
+    if (UNLIKELY(len == max_strlen)) {
      is_complete = false;
      break;
    }