patch 8.0.0134

Problem:    Null pointer access reported by UBsan.
Solution:   Check curwin->w_buffer is not NULL. (Yegappan Lakshmanan)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 206ead18527c928bed6f1cbf5de40607e7cf076e..484a22c74a33a4ea4e67b1624334f9a621f5c946 100644 (file)
--- 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 2e3cb057e979349bcf0fc3e7ec6ed0d4a8d61599..723544ff4262b1f1e2d96aae46b79f5b3c8f96cf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    134,
 /**/
     133,
 /**/