# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1448217905 -3600
# Node ID 79270eaac6dee1867bd6f9f6aff06429aa81f8e4
# Parent  c4606e322fa40db6cf0adec2c033963e8bafefa3
commit https://github.com/vim/vim/commit/294a7e55b01149154807a23323038784549b8946
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Nov 22 19:39:38 2015 +0100

    patch 7.4.936
    Problem:    Crash when dragging with the mouse.
    Solution:   Add safety check for NULL pointer. Check mouse position for valid
                value. (Hirohito Higashi)

diff --git a/src/term.c b/src/term.c
--- a/src/term.c
+++ b/src/term.c
@@ -5231,6 +5231,13 @@ check_termcode(max_offset, buf, bufsize,
 	    else
 		key_name[1] = get_pseudo_mouse_code(current_button,
 							   is_click, is_drag);
+
+	    /* Make sure the mouse position is valid.  Some terminals may
+	     * return weird values. */
+	    if (mouse_col >= Columns)
+		mouse_col = Columns - 1;
+	    if (mouse_row >= Rows)
+		mouse_row = Rows - 1;
 	}
 #endif /* FEAT_MOUSE */
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    936,
+/**/
     935,
 /**/
     934,
diff --git a/src/window.c b/src/window.c
--- a/src/window.c
+++ b/src/window.c
@@ -5785,6 +5785,8 @@ win_drag_vsep_line(dragwin, offset)
 	offset = room;		/* Move as far as we can */
     if (offset <= 0)		/* No room at all, quit. */
 	return;
+    if (fr == NULL)
+	return;			/* Safety check, should not happen. */
 
     /* grow frame fr by offset lines */
     frame_new_width(fr, fr->fr_width + offset, left, FALSE);