From dcb443416e09a95f41693e1d5030867f5278e08f Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Thu, 16 Apr 2020 10:31:51 -0300 Subject: Fix memcpy overlapping buffers This crashes with ASAN enabled. ``` ==39366==ERROR: AddressSanitizer: memcpy-param-overlap: memory ranges [0x6230000ae848,0x6230000ae85a) and [0x6230000ae851, 0x6230000ae863) overlap ``` --- source/blender/blenloader/intern/versioning_280.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/blenloader/intern/versioning_280.c') diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index d53b6cde4ae..7904e51a516 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -4410,10 +4410,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) ColorManagedViewSettings *view_settings; view_settings = &scene->view_settings; if (BLI_str_startswith(view_settings->look, "Filmic - ")) { - STRNCPY(view_settings->look, view_settings->look + strlen("Filmic - ")); + char *src = view_settings->look + strlen("Filmic - "); + memmove(view_settings->look, src, strlen(src) + 1); } else if (BLI_str_startswith(view_settings->look, "Standard - ")) { - STRNCPY(view_settings->look, view_settings->look + strlen("Standard - ")); + char *src = view_settings->look + strlen("Standard - "); + memmove(view_settings->look, src, strlen(src) + 1); } } -- cgit v1.2.3