1 files changed, 8 insertions, 2 deletions

diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index bcc6f19c3a35..a2eb80fbc896 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -31,6 +31,10 @@ static int list_width, check_x, item_x;
 static void print_item(WINDOW * win, int choice, int selected)
 {
         int i;
+        char *list_item = malloc(list_width + 1);
+
+        strncpy(list_item, item_str(), list_width - item_x);
+        list_item[list_width - item_x] = '\0';
 
         /* Clear 'residue' of last item */
         wattrset(win, dlg.menubox.atr);
@@ -45,13 +49,14 @@ static void print_item(WINDOW * win, int choice, int selected)
                 wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
 
         wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);
-        mvwaddch(win, choice, item_x, item_str()[0]);
+        mvwaddch(win, choice, item_x, list_item[0]);
         wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr);
-        waddstr(win, (char *)item_str() + 1);
+        waddstr(win, list_item + 1);
         if (selected) {
                 wmove(win, choice, check_x + 1);
                 wrefresh(win);
         }
+        free(list_item);
 }
 
 /*
@@ -175,6 +180,7 @@ do_resize:
         check_x = 0;
         item_foreach()
                 check_x = MAX(check_x, strlen(item_str()) + 4);
+        check_x = MIN(check_x, list_width);
 
         check_x = (list_width - check_x) / 2;
         item_x = check_x + 4;