blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix memcpy overlapping buffers 

This crashes with ASAN enabled.
```
==39366==ERROR: AddressSanitizer: memcpy-param-overlap: memory ranges [0x6230000ae848,0x6230000ae85a) and [0x6230000ae851, 0x6230000ae863) overlap
```
This commit is contained in:
Germano Cavalcante 2020-04-16 10:31:51 -03:00
parent 3ea4d3dc07
commit dcb443416e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenloader/intern/versioning_280.c
View File

@ -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);
}
}