Avoid empty entries in generated menu choices list; main-menu wrongly

assumed that the last package in the list is always installable.

r18254

debian/changelog

@@ -2,6 +2,9 @@ main-menu (0.072) UNRELEASED; urgency=low
 
   * Joey Hess
     - Remove some dead code Bruce Perens noticed.
+  * Colin Watson
+    - Avoid empty entries in generated menu choices list; main-menu wrongly
+      assumed that the last package in the list is always installable.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2004 19:40:31 -0400
 

main-menu.c

@@ -251,10 +251,10 @@ di_system_package *show_main_menu(di_packages *packages, di_packages_allocator *
 			menu_size += 1024;
 			menu = di_realloc(menu, menu_size);
 		}
+		if (*menu)
+			strcat(menu, ", ");
 		strcat(menu, buf);
 		menu_used += size + 2;
-		if (node->next)
-			strcat(menu, ", ");
 	}
 	menudefault = get_default_menu_item(list);
 	di_slist_free(list);