[Bf-blender-cvs] [86f42ee] master: OSX 10.10: fix for Blender crashing on fsmenu due icloud in the favorite list but pointer is NULL when not activated This does not break other OSX versions, just add a check for pathString

Jens Verwiebe noreply at git.blender.org
Wed Jun 4 10:54:40 CEST 2014


Commit: 86f42ee33137897ec08ddde0fdcd2d1087ea78dc
Author: Jens Verwiebe
Date:   Wed Jun 4 10:54:21 2014 +0200
https://developer.blender.org/rB86f42ee33137897ec08ddde0fdcd2d1087ea78dc

OSX 10.10: fix for Blender crashing on fsmenu due icloud in the favorite list but pointer is NULL when not activated
This does not break other OSX versions, just add a check for pathString

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

M	source/blender/editors/space_file/fsmenu.c

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

diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 6284caf..d049a45 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -441,7 +441,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
 				
 				pathString = CFURLCopyFileSystemPath(cfURL, kCFURLPOSIXPathStyle);
 				
-				if (!CFStringGetCString(pathString, line, sizeof(line), kCFStringEncodingASCII))
+				if (pathString == NULL || !CFStringGetCString(pathString, line, sizeof(line), kCFStringEncodingASCII))
 					continue;
 				fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, FS_INSERT_SORTED);




More information about the Bf-blender-cvs mailing list