--- lbbs/src/menu.c	2025/06/24 10:01:24	1.68
+++ lbbs/src/menu.c	2025/07/02 04:17:33	1.71
@@ -38,7 +38,7 @@
 
 #define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4)
 
-MENU_SET *p_bbs_menu;
+MENU_SET bbs_menu;
 
 int load_menu(MENU_SET *p_menu_set, const char *conf_file)
 {
@@ -60,6 +60,9 @@ int load_menu(MENU_SET *p_menu_set, cons
 	key_t key;
 	size_t size;
 
+	// Initialize the data structure
+	memset(p_menu_set, 0, sizeof(*p_menu_set));
+
 	// Use trie_dict to search menu_id by menu name
 	p_menu_set->p_menu_name_dict = trie_dict_create();
 	if (p_menu_set->p_menu_name_dict == NULL)
@@ -119,6 +122,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 	p_menu_set->menu_screen_count = 0;
 	p_menu_set->choose_step = 0;
 	p_menu_set->menu_id_path[0] = 0;
+	p_menu_set->menu_item_pos[0] = 0;
 	p_menu_set->allow_exit = 0;
 
 	while (fgets(buffer, sizeof(buffer), fin))
@@ -984,6 +988,15 @@ int display_menu(MENU_SET *p_menu_set)
 		return EXITMENU;
 	}
 
+	if(p_menu->item_count <= 0) // empty menu
+	{
+		moveto(p_menu->screen_row, p_menu->screen_col);
+		clrtoeol();
+		prints("没有可选项");
+		press_any_key();
+		return -1;
+	}
+
 	menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step];
 	menu_item_id = p_menu->items[menu_item_pos];
 	p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
@@ -1055,7 +1068,7 @@ int display_menu(MENU_SET *p_menu_set)
 	{
 		moveto(p_menu->screen_row, p_menu->screen_col);
 		clrtoeol();
-		prints("û�п�ѡ��");
+		prints("没有可选项");
 		press_any_key();
 		return -1;
 	}
@@ -1395,6 +1408,10 @@ int get_menu_shm_readonly(MENU_SET *p_me
 	p_menu_set->p_menu_screen_buf = p_menu_set->p_menu_screen_pool + sizeof(MENU_SCREEN) * MAX_MENUS;
 	p_menu_set->p_menu_screen_buf_free = p_menu_set->p_menu_screen_buf;
 
+	p_menu_set->choose_step = 0;
+	p_menu_set->menu_id_path[0] = 0;
+	p_menu_set->menu_item_pos[0] = 0;
+
 	return 0;
 }