Apply PR suggestions: only copy grouping-dependent members if grouping is set, move after declarations

Author: HadrienG2

hwloc/distances.c

@@ -185,14 +185,17 @@ static int hwloc_internal_distances_dup_one(struct hwloc_topology *new, struct h
 /* This function may be called with topology->tma set, it cannot free() or realloc() */
 int hwloc_internal_distances_dup(struct hwloc_topology *new, struct hwloc_topology *old)
 {
-  new->grouping = old->grouping;
-  new->grouping_verbose = old->grouping_verbose;
-  new->grouping_nbaccuracies = old->grouping_nbaccuracies;
-  memcpy(new->grouping_accuracies, old->grouping_accuracies, sizeof(old->grouping_accuracies));
-  new->grouping_next_subkind = old->grouping_next_subkind;
-
   struct hwloc_internal_distances_s *olddist;
   int err;
+
+  new->grouping = old->grouping;
+  if (old->grouping) {
+    new->grouping_verbose = old->grouping_verbose;
+    new->grouping_nbaccuracies = old->grouping_nbaccuracies;
+    memcpy(new->grouping_accuracies, old->grouping_accuracies, sizeof(old->grouping_accuracies));
+    new->grouping_next_subkind = old->grouping_next_subkind;
+  }
+
   new->next_dist_id = old->next_dist_id;
   for(olddist = old->first_dist; olddist; olddist = olddist->next) {
     err = hwloc_internal_distances_dup_one(new, olddist);