[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60715] trunk/blender/source/blender/ editors/interface/interface_eyedropper.c: fix for possible eyedropper NULL pointer use.

[Campbell Barton]

Revision: 60715
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60715
Author:   campbellbarton
Date:     2013-10-12 18:11:54 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
fix for possible eyedropper NULL pointer use.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_eyedropper.c

Modified: trunk/blender/source/blender/editors/interface/interface_eyedropper.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_eyedropper.c	2013-10-12 15:31:53 UTC (rev 60714)
+++ trunk/blender/source/blender/editors/interface/interface_eyedropper.c	2013-10-12 18:11:54 UTC (rev 60715)
@@ -116,9 +116,10 @@
 {
 	WM_cursor_modal_restore(CTX_wm_window(C));
 
-	if (op->customdata)
+	if (op->customdata) {
 		MEM_freeN(op->customdata);
-	op->customdata = NULL;
+		op->customdata = NULL;
+	}
 }
 
 static int eyedropper_cancel(bContext *C, wmOperator *op)
@@ -433,15 +434,17 @@
 
 static void datadropper_exit(bContext *C, wmOperator *op)
 {
-	DataDropper *ddr = (DataDropper *)op->customdata;
-
 	WM_cursor_modal_restore(CTX_wm_window(C));
 
-	ED_region_draw_cb_exit(ddr->art, ddr->draw_handle_pixel);
+	if (op->customdata) {
+		DataDropper *ddr = (DataDropper *)op->customdata;
 
-	if (op->customdata)
+		ED_region_draw_cb_exit(ddr->art, ddr->draw_handle_pixel);
+
 		MEM_freeN(op->customdata);
-	op->customdata = NULL;
+
+		op->customdata = NULL;
+	}
 }
 
 static int datadropper_cancel(bContext *C, wmOperator *op)