Mercurial > vim
changeset 5070:cf52d2a8c05c v7.3.1278
updated for version 7.3.1278
Problem: When someone sets the screen size to a huge value with "stty" Vim
runs out of memory before reducing the size.
Solution: Limit Rows and Columns in more places.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 30 Jun 2013 17:51:51 +0200 |
| parents | 44f2eb39f49e |
| children | 1ad9383d56d5 |
| files | src/gui.c src/gui_gtk_x11.c src/option.c src/os_unix.c src/proto/term.pro src/term.c src/version.c |
| diffstat | 7 files changed, 24 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -1620,6 +1620,7 @@ gui_set_shellsize(mustset, fit_to_displa un_maximize = FALSE; #endif } + limit_screen_size(); gui.num_cols = Columns; gui.num_rows = Rows;
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3698,6 +3698,7 @@ gui_mch_open(void) p_window = h - 1; Rows = h; } + limit_screen_size(); pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width); pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
--- a/src/option.c +++ b/src/option.c @@ -8528,11 +8528,7 @@ set_num_option(opt_idx, varp, value, err } Columns = MIN_COLUMNS; } - /* Limit the values to avoid an overflow in Rows * Columns. */ - if (Columns > 10000) - Columns = 10000; - if (Rows > 1000) - Rows = 1000; + limit_screen_size(); #ifdef DJGPP /* avoid a crash by checking for a too large value of 'columns' */
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -3777,6 +3777,7 @@ mch_get_shellsize() Rows = rows; Columns = columns; + limit_screen_size(); return OK; }
--- a/src/proto/term.pro +++ b/src/proto/term.pro @@ -26,6 +26,7 @@ void term_settitle __ARGS((char_u *title void ttest __ARGS((int pairs)); void add_long_to_buf __ARGS((long_u val, char_u *dst)); void check_shellsize __ARGS((void)); +void limit_screen_size __ARGS((void)); void win_new_shellsize __ARGS((void)); void shell_resized __ARGS((void)); void shell_resized_check __ARGS((void));
--- a/src/term.c +++ b/src/term.c @@ -2962,15 +2962,29 @@ get_bytes_from_buf(buf, bytes, num_bytes #endif /* - * Check if the new shell size is valid, correct it if it's too small. + * Check if the new shell size is valid, correct it if it's too small or way + * too big. */ void check_shellsize() { + if (Rows < min_rows()) /* need room for one window and command line */ + Rows = min_rows(); + limit_screen_size(); +} + +/* + * Limit Rows and Columns to avoid an overflow in Rows * Columns. + */ + void +limit_screen_size() +{ if (Columns < MIN_COLUMNS) Columns = MIN_COLUMNS; - if (Rows < min_rows()) /* need room for one window and command line */ - Rows = min_rows(); + else if (Columns > 10000) + Columns = 10000; + if (Rows > 1000) + Rows = 1000; } /*