[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58208] trunk/blender/source/blender: fix for misc errors

[Campbell Barton]

Revision: 58208
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58208
Author:   campbellbarton
Date:     2013-07-13 05:46:48 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
fix for misc errors
- reference to out of scope stack var
- freeing fixes size array (never allocated)
- add matching va_end for va_start

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/editors/interface/interface.c
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2013-07-13 05:43:35 UTC (rev 58207)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-07-13 05:46:48 UTC (rev 58208)
@@ -349,9 +349,6 @@
 		if (ntype->outputs) {
 			MEM_freeN(ntype->outputs);
 		}
-		if (ntype->ui_name) {
-			MEM_freeN((void *)ntype->ui_name);
-		}
 	}
 }
 

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2013-07-13 05:43:35 UTC (rev 58207)
+++ trunk/blender/source/blender/editors/interface/interface.c	2013-07-13 05:46:48 UTC (rev 58208)
@@ -4142,6 +4142,7 @@
 
 		si->strinfo = tmp;
 	}
+	va_end(args);
 
 	if (free_items && items)
 		MEM_freeN(items);

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2013-07-13 05:43:35 UTC (rev 58207)
+++ trunk/blender/source/blender/editors/object/object_add.c	2013-07-13 05:46:48 UTC (rev 58208)
@@ -265,6 +265,7 @@
                                    bool *enter_editmode, unsigned int *layer, bool *is_view_aligned)
 {
 	View3D *v3d = CTX_wm_view3d(C);
+	unsigned int _layer;
 
 	/* Switch to Edit mode? */
 	if (RNA_struct_find_property(op->ptr, "enter_editmode")) { /* optional */
@@ -283,7 +284,6 @@
 	/* Get layers! */
 	{
 		int a, layer_values[20];
-		unsigned int _layer;
 		if (!layer)
 			layer = &_layer;