Merge remote-tracking branch 'origin/slurm-2.3'

Conflicts:
	NEWS
	src/sview/common.c

NEWS

@@ -10,6 +10,10 @@ documents those changes that are of interest to users and admins.
     (i.e. BP List -> MidplaneList).
  -- BLUEGENE - read MPs and BPs from the bluegene.conf
 
+* Changes in SLURM 2.3.1
+========================
+ -- Fix for memory issue inside sview.
+
 * Changes in SLURM 2.3.0
 ========================
  -- BLUEGENE - make sure we only set the jobinfo_select start_loc on a job

src/sview/common.c

@@ -953,11 +953,25 @@ extern void set_page_opts(int page, display_data_t *display_data,
 	while ((col_name = list_next(itr))) {
 		replus(col_name);
 		if (strstr(col_name, "list")) {
+			char *orig_ptr = col_name;
 			xstrsubstitute(col_name, "bp ", "midplane");
 			if (cluster_flags & CLUSTER_FLAG_BG)
 				xstrsubstitute(col_name, "node", "midplane");
 			else
 				xstrsubstitute(col_name, "midplane", "node");
+
+			/* Make sure we have the correct pointer here
+			   since xstrsubstitute() could of changed it
+			   on us.
+			*/
+			if (col_name != orig_ptr) {
+				list_insert(itr, col_name);
+				/* Don't use list_delete_item().
+				   xstrsubstitute() has already
+				   deleted it for us.
+				*/
+				list_remove(itr);
+			}
 		}
 		while (display_data++) {
 			if (display_data->id == -1)