# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1656239404 -7200
# Node ID d9acbf59032ca8d4838a2b52d3f240fa0bddc26e
# Parent  8382479d5631dca26248169a75ce1f996e3a892b
patch 8.2.5161: might still access invalid memory

Commit: https://github.com/vim/vim/commit/0fbc9260a75dfc4d86f20e7c0eb76878f513a212
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jun 26 11:17:10 2022 +0100

    patch 8.2.5161: might still access invalid memory

    Problem:    Might still access invalid memory.
    Solution:   Add extra check for negative value.

diff --git a/src/message.c b/src/message.c
--- a/src/message.c
+++ b/src/message.c
@@ -949,8 +949,10 @@ msg_may_trunc(int force, char_u *s)
     int		n;
     int		room;
 
+    // If something unexpected happened "room" may be negative, check for that
+    // just in case.
     room = (int)(Rows - cmdline_row - 1) * Columns + sc_col - 1;
-    if ((force || (shortmess(SHM_TRUNC) && !exmode_active))
+    if (room > 0 && (force || (shortmess(SHM_TRUNC) && !exmode_active))
 	    && (n = (int)STRLEN(s) - room) > 0)
     {
 	if (has_mbyte)
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5161,
+/**/
     5160,
 /**/
     5159,