From 741ea17038d4b227a4433c87d918a9da0737fc50 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 24 Aug 2019 14:16:32 +0200 Subject: [PATCH] patch 8.1.1916: trying to allocate negative amount of memory closing popup 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. --- src/ui.c | 7 ++++++- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ui.c b/src/ui.c index 61f19bc4b..7095eda02 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1184,7 +1184,10 @@ clip_process_selection( 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) { #ifdef FEAT_GUI @@ -1591,6 +1594,8 @@ clip_copy_modeless_selection(int both UNUSED) col1 = clip_star.min_col; if (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) row1 = clip_star.min_row; if (row2 > clip_star.max_row) diff --git a/src/version.c b/src/version.c index 8ece6f1cb..51851e33b 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1916, /**/ 1915, /**/ -- 2.50.1