[Bf-blender-cvs] [a394d681775] blender2.8: Fix possible heap use-after-free in workspace lib-linking
Julian Eisel
noreply at git.blender.org
Wed Jun 14 00:11:50 CEST 2017
Commit: a394d681775cc9f5e83a28fb12c0d6aba1a6681c
Author: Julian Eisel
Date: Wed Jun 14 00:09:37 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBa394d681775cc9f5e83a28fb12c0d6aba1a6681c
Fix possible heap use-after-free in workspace lib-linking
Caused by one of the recent commits during workspace review.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 682ca637fcb..fc97beb2c7e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2797,9 +2797,10 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
IDP_LibLinkProperty(id->properties, fd);
id_us_ensure_real(id);
- for (WorkSpaceLayout *layout = layouts->first; layout; layout = layout->next) {
+ for (WorkSpaceLayout *layout = layouts->first, *layout_next; layout; layout = layout_next) {
bScreen *screen = newlibadr(fd, id->lib, BKE_workspace_layout_screen_get(layout));
+ layout_next = layout->next;
if (screen) {
BKE_workspace_layout_screen_set(layout, screen);
More information about the Bf-blender-cvs
mailing list