aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1916: trying to allocate negative amount of memory closing popup

Browse Source 
Problem:    Trying to allocate negative amount of memory when closing a popup.
Solution:   Check the rows are not out of bounds.  Don't finish a selection if
            it was never started.
This commit is contained in:
Bram Moolenaar 2019-08-24 14:16:32 +02:00
parent 1a3a89168d
commit 741ea17038
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui.c
View File

@ -1184,7 +1184,10 @@ clip_process_selection(
if (button == MOUSE_RELEASE) if (button == MOUSE_RELEASE)
{ {
/* Check to make sure we have something selected */ if (cb->state != SELECT_IN_PROGRESS)
return;
// Check to make sure we have something selected
if (cb->start.lnum == cb->end.lnum && cb->start.col == cb->end.col) if (cb->start.lnum == cb->end.lnum && cb->start.col == cb->end.col)
{ {
#ifdef FEAT_GUI #ifdef FEAT_GUI
@ -1591,6 +1594,8 @@ clip_copy_modeless_selection(int both UNUSED)
col1 = clip_star.min_col; col1 = clip_star.min_col;
if (col2 > clip_star.max_col) if (col2 > clip_star.max_col)
col2 = clip_star.max_col; col2 = clip_star.max_col;
if (row1 > clip_star.max_row || row2 < clip_star.min_row)
return;
if (row1 < clip_star.min_row) if (row1 < clip_star.min_row)
row1 = clip_star.min_row; row1 = clip_star.min_row;
if (row2 > clip_star.max_row) if (row2 > clip_star.max_row)

2
src/version.c
View File

@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1916,
/**/ /**/
1915, 1915,
/**/ /**/