patch 9.2.0487: viminfo: possible signed int overflow in register array

Problem:  viminfo: possible signed int overflow in register array growth
Solution: Cast to size_t (Yasuhiro Matsumoto)

The expression `limit * 2 * sizeof(string_T)` in read_viminfo_register()
multiplies in int and overflows once limit exceeds INT_MAX/2. Cast to
size_t first so the size computation stays unsigned. Defensive only;
reaching this path requires registers consuming many gigabytes.

closes: #20207

Signed-off-by: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/version.c b/src/version.c
index 046cc83425f1495e4589187d7441be83cd17de7c..0714ec1ac093e0e557d5a5bde32f48ab9e8f4ae4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    487,
 /**/
     486,
 /**/

diff --git a/src/viminfo.c b/src/viminfo.c
index d05900544a8b5f8eb295407d79abecc976331857..bb84726c8f99595be511ed1b6ab39f8303d69982 100644 (file)
--- a/src/viminfo.c
+++ b/src/viminfo.c
@@ -1706,7 +1706,7 @@ read_viminfo_register(vir_T *virp, int force)
            if (size == limit)
            {
                string_T *new_array = (string_T *)
-                                          alloc(limit * 2 * sizeof(string_T));
+                                   alloc((size_t)limit * 2 * sizeof(string_T));
 
                if (new_array == NULL)
                {