diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2022-02-18 18:36:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2022-02-18 18:36:45 +0300 |
| commit | 48b17da1d9fe4d559c5b0fa58029df05a45d3960 (patch) | |
| tree | 7401b04a1e63573144daec00fe96b88ac051db72 /source/blender/blenlib/intern/string.c | |
| parent | 734c6a4405f21078270e71a4c2f0e98e74173ad7 (diff) | |
| parent | 1b47d07d7661b26b462f0e6fe87dabeb24d85168 (diff) | |
Merge remote-tracking branch 'origin/blender-v3.1-release'
Diffstat (limited to 'source/blender/blenlib/intern/string.c')
| -rw-r--r-- | source/blender/blenlib/intern/string.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index 976c1b0226f..75fa628e701 100644 --- 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; } |