[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53128] trunk/blender/source/blender/ windowmanager/intern/wm_operators.c: fix leak in previous commit

Campbell Barton ideasman42 at gmail.com
Tue Dec 18 16:27:15 CET 2012


Revision: 53128
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53128
Author:   campbellbarton
Date:     2012-12-18 15:27:14 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
fix leak in previous commit

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2012-12-18 15:22:06 UTC (rev 53127)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2012-12-18 15:27:14 UTC (rev 53128)
@@ -562,14 +562,19 @@
 
 char *WM_prop_pystring_assign(bContext *C, PointerRNA *ptr, PropertyRNA *prop, int index)
 {
-	char *lhs = RNA_path_full_property_py(ptr, prop, index);
-	char *rhs = RNA_property_as_string(C, ptr, prop, index);
-	char *ret;
+	char *lhs, *rhs, *ret;
 
+	lhs = RNA_path_full_property_py(ptr, prop, index);
 	if (!lhs) {
 		return NULL;
 	}
 
+	rhs = RNA_property_as_string(C, ptr, prop, index);
+	if (!rhs) {
+		MEM_freeN(lhs);
+		return NULL;
+	}
+
 	ret = BLI_sprintfN("%s = %s", lhs, rhs);
 	MEM_freeN(lhs);
 	MEM_freeN(rhs);




More information about the Bf-blender-cvs mailing list