[Bf-blender-cvs] [2a6ec00] master: Fix T49746: crash loading user preferences with missing operators.

Brecht Van Lommel noreply at git.blender.org
Sun Oct 16 21:26:03 CEST 2016


Commit: 2a6ec00b9b083e8c235ec4721d6fa67b9bee4794
Author: Brecht Van Lommel
Date:   Sun Oct 16 21:19:52 2016 +0200
Branches: master
https://developer.blender.org/rB2a6ec00b9b083e8c235ec4721d6fa67b9bee4794

Fix T49746: crash loading user preferences with missing operators.

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

M	source/blender/windowmanager/intern/wm_keymap.c

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

diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index ed3cce5..e201fa4 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -77,6 +77,10 @@ static wmKeyMapItem *wm_keymap_item_copy(wmKeyMapItem *kmi)
 		kmin->properties = IDP_CopyProperty(kmin->properties);
 		kmin->ptr->data = kmin->properties;
 	}
+	else {
+		kmin->properties = NULL;
+		kmin->ptr = NULL;
+	}
 
 	return kmin;
 }
@@ -87,6 +91,8 @@ static void wm_keymap_item_free(wmKeyMapItem *kmi)
 	if (kmi->ptr) {
 		WM_operator_properties_free(kmi->ptr);
 		MEM_freeN(kmi->ptr);
+		kmi->ptr = NULL;
+		kmi->properties = NULL;
 	}
 }
 
@@ -121,7 +127,6 @@ static void wm_keymap_item_properties_update_ot(wmKeyMapItem *kmi)
 		else {
 			/* zombie keymap item */
 			wm_keymap_item_free(kmi);
-			kmi->ptr = NULL;
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list