diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/version.c | 2 | ||||
-rw-r--r-- | src/nvim/window.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 246ce02f1f..91ef23548d 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -278,7 +278,7 @@ static int included_patches[] = { //320, //319 NA 318, - //317, + 317, //316 NA 315, 314, diff --git a/src/nvim/window.c b/src/nvim/window.c index 050f5e2acd..3499b14688 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -3730,8 +3730,11 @@ void win_alloc_lines(win_T *wp) */ void win_free_lsize(win_T *wp) { - free(wp->w_lines); - wp->w_lines = NULL; + // TODO: why would wp be NULL here? + if (wp != NULL) { + free(wp->w_lines); + wp->w_lines = NULL; + } } /* |