[Bf-blender-cvs] [271624b0f6b] blender2.8: Prevent segfault when opening file browser while a 2.79 file was loaded.

Sybren A. Stüvel noreply at git.blender.org
Tue May 8 11:19:23 CEST 2018


Commit: 271624b0f6b97cc2198332b40c60a784eebd462e
Author: Sybren A. Stüvel
Date:   Tue May 8 11:18:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB271624b0f6b97cc2198332b40c60a784eebd462e

Prevent segfault when opening file browser while a 2.79 file was loaded.

Loading a file that was written with the master branch into the 2.8 branch,
and then trying to load or save, caused a segfault.

===================================================================

M	source/blender/editors/screen/screen_edit.c

===================================================================

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index d024262121c..8ebdb5f32b8 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1150,7 +1150,7 @@ static bScreen *screen_fullscreen_find_associated_normal_screen(const Main *bmai
 {
 	for (bScreen *screen_iter = bmain->screen.first; screen_iter; screen_iter = screen_iter->id.next) {
 		ScrArea *sa = screen_iter->areabase.first;
-		if (sa->full == screen) {
+		if (sa && sa->full == screen) {
 			return screen_iter;
 		}
 	}



More information about the Bf-blender-cvs mailing list