fix visualstudio build 6

Author: ndenoyelle

hwloc/distrib.c

@@ -97,7 +97,11 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
 			  const unsigned long flags)
 {
 	unsigned i;
-	struct hwloc_distrib_level *levels = malloc(n_types * sizeof(*levels));
+        unsigned arity;
+	hwloc_obj_t parent;
+	struct hwloc_distrib_level *levels;
+
+	levels = malloc(n_types * sizeof(*levels));
 	if(levels == NULL)
 		return NULL;
 
@@ -118,8 +122,6 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
 	qsort(levels, n_types, sizeof(*levels), hwloc_distrib_level_cmp_depth);	
 
 	// Walk from top to bottom and set arity to the maximum arity below root field.
-        unsigned arity;
-	hwloc_obj_t parent;
 
 	parent=root;	
 	for (i=0; i<n_types; i++){
@@ -229,7 +231,9 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 
 	unsigned i=0, n=0;
 	hwloc_obj_t obj, root = hwloc_get_obj_by_depth(topology, 0, 0);
-	
+	hwloc_obj_type_t *levels;
+	struct hwloc_distrib_iterator *it;
+
 	// Count depths with a non empty cpuset. 
 	obj = root;
 	while(obj){
@@ -240,9 +244,8 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 		obj = obj->first_child;
 	}
 
-	hwloc_obj_type_t levels[n];
-
 	// fill levels array.
+        levels = malloc(sizeof(*levels) * n);
 	obj = root;
 	while(obj){
 		if( obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset) && hwloc_get_type_depth(topology, obj->type) >= 0){
@@ -254,10 +257,10 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 		obj = obj->first_child;
 	}
 
-	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) + sizeof(hwloc_obj_t) + sizeof(struct hwloc_distrib_level*));
+	it = malloc(sizeof(*it) + sizeof(hwloc_obj_t) + sizeof(struct hwloc_distrib_level*));
 
 	if(it == NULL)
-		return NULL;
+		goto failure;
 
 	it->roots = (hwloc_obj_t*) ((char*)it + sizeof(*it));
 	*it->roots = root;	
@@ -268,11 +271,17 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 
         *it->levels = hwloc_distrib_root_levels(topology, root, levels, n, flags);
 
-	if (*it->levels == NULL){
-		free(it);
-		return NULL;
-	}
+	if (*it->levels == NULL)
+		goto failure_with_it;
+
+	free(levels);
 	return it;
+
+ failure_with_it:
+	free(it);
+ failure:
+	free(levels);
+	return NULL;
 }
 
 void hwloc_distrib_destroy_iterator(struct hwloc_distrib_iterator *it){