[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54539] trunk/blender/source/blender: add missing NULL checks - could cause crashes in rare cases.

[Campbell Barton]

Revision: 54539
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54539
Author:   campbellbarton
Date:     2013-02-14 01:01:08 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
add missing NULL checks - could cause crashes in rare cases.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
    trunk/blender/source/blender/windowmanager/intern/wm_keymap.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2013-02-13 23:09:12 UTC (rev 54538)
+++ trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2013-02-14 01:01:08 UTC (rev 54539)
@@ -236,7 +236,7 @@
 {
 	Object *ob = (scene->basact) ? scene->basact->object : NULL;
 
-	if (ob) {
+	if (ob && ob->sculpt) {
 		Sculpt *sd = scene->toolsettings->sculpt;
 		ob->sculpt->show_diffuse_color = sd->flags & SCULPT_SHOW_DIFFUSE;
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2013-02-13 23:09:12 UTC (rev 54538)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2013-02-14 01:01:08 UTC (rev 54539)
@@ -126,10 +126,13 @@
 /* properties can be NULL, otherwise the arg passed is used and ownership is given to the kmi */
 void WM_keymap_properties_reset(wmKeyMapItem *kmi, struct IDProperty *properties)
 {
-	WM_operator_properties_free(kmi->ptr);
-	MEM_freeN(kmi->ptr);
+	if (LIKELY(kmi->ptr)) {
+		WM_operator_properties_free(kmi->ptr);
+		MEM_freeN(kmi->ptr);
 
-	kmi->ptr = NULL;
+		kmi->ptr = NULL;
+	}
+
 	kmi->properties = properties;
 
 	wm_keymap_item_properties_set(kmi);