aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/window.c
diff options
context:
space:
mode:
authorwatiko <service@mail.watiko.net>2016-02-16 23:05:47 +0900
committerJustin M. Keyes <justinkz@gmail.com>2016-02-22 01:12:47 -0500
commit9403ce82bce1a2dcda4b01b10b2c01ee42bb4034 (patch)
treee1cfc6ea2c9b1dac4b2671905e8bd7b0323ab082 /src/nvim/window.c
parentbfe9ebcbe1a4aff708f0fce1ee0e0589be32e8d8 (diff)
downloadrneovim-9403ce82bce1a2dcda4b01b10b2c01ee42bb4034.tar.gz
rneovim-9403ce82bce1a2dcda4b01b10b2c01ee42bb4034.tar.bz2
rneovim-9403ce82bce1a2dcda4b01b10b2c01ee42bb4034.zip
vim-patch:7.4.936 #4271
Problem: Crash when dragging with the mouse. Solution: Add safety check for NULL pointer. Check mouse position for valid value. (Hirohito Higashi) https://github.com/vim/vim/commit/294a7e55b01149154807a23323038784549b8946 --- see: "Crash while mouse-selecting in two-buffer mode" https://github.com/vim/vim/issues/486 Fix #3704
Diffstat (limited to 'src/nvim/window.c')
-rw-r--r--src/nvim/window.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 36cb48f3a1..39106a7b8d 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -4575,10 +4575,19 @@ void win_drag_vsep_line(win_T *dragwin, int offset)
}
assert(fr);
- if (room < offset) /* Not enough room */
- offset = room; /* Move as far as we can */
- if (offset <= 0) /* No room at all, quit. */
+ // Not enough room
+ if (room < offset) {
+ offset = room; // Move as far as we can
+ }
+
+ // No room at all, quit.
+ if (offset <= 0) {
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);