diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-12-14 21:42:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-12-14 21:42:00 +0100 |
| commit | c4bfedabe057c05f09a455a5851089e177fa9c00 (patch) | |
| tree | fbb9f1dee8c9bb17c860854fdf922ab454c8b027 | |
| parent | fe38b494fff56cd9b2fcaeef26a8fd7b6557d69c (diff) | |
patch 8.0.0134v8.0.0134
Problem: Null pointer access reported by UBsan.
Solution: Check curwin->w_buffer is not NULL. (Yegappan Lakshmanan)
| -rw-r--r-- | src/ex_cmds.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 206ead1852..484a22c74a 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3967,7 +3967,8 @@ do_ecmd( * <VN> We could instead free the synblock * and re-attach to buffer, perhaps. */ - if (curwin->w_s == &(curwin->w_buffer->b_s)) + if (curwin->w_buffer != NULL + && curwin->w_s == &(curwin->w_buffer->b_s)) curwin->w_s = &(buf->b_s); #endif curwin->w_buffer = buf; diff --git a/src/version.c b/src/version.c index 2e3cb057e9..723544ff42 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 134, +/**/ 133, /**/ 132, |