patch 9.1.1303: missing out-of-memory check in linematch.c

Problem:  missing out-of-memory check in linematch.c
Solution: return early in case of memory allocation failure, move the
          pow() calculation ouside of the for() loop
          (John Marriott)

closes: #17118

Signed-off-by: John Marriott <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/linematch.c b/src/linematch.c
index 17e932d0032a3124a8997904a688e7b0d0757086..1fab28276049558720e0ee547a7f5f3183c1db3f 100644 (file)
--- a/src/linematch.c
+++ b/src/linematch.c
@@ -410,12 +410,16 @@ linematch_nbuffers(
 
     // create the flattened path matrix
     diffcmppath_T *diffcmppath = lalloc(sizeof(diffcmppath_T) * memsize, TRUE);
+    if (diffcmppath == NULL)
+       return 0;
+
     // allocate memory here
+    size_t n = (size_t)pow(2.0, (double)ndiffs);
     for (size_t i = 0; i < memsize; i++)
     {
        diffcmppath[i].df_lev_score = 0;
        diffcmppath[i].df_path_n = 0;
-       for (size_t j = 0; j < (size_t)pow(2, (double)ndiffs); j++)
+       for (size_t j = 0; j < n; j++)
            diffcmppath[i].df_choice_mem[j] = -1;
     }
 
@@ -428,6 +432,12 @@ linematch_nbuffers(
     diffcmppath_T *startNode = &diffcmppath[u];
 
     *decisions = lalloc(sizeof(int) * memsize_decisions, TRUE);
+    if (*decisions == NULL)
+    {
+       vim_free(diffcmppath);
+       return 0;
+    }
+
     size_t n_optimal = 0;
     test_charmatch_paths(startNode, 0);
     while (startNode->df_path_n > 0)

diff --git a/src/version.c b/src/version.c
index 90ddf0bab44f35d090b1cdb37aee29a7d0808dd2..e2314ca12fb9b4961c1548db763405a0ed72249e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1303,
 /**/
     1302,
 /**/