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>
This commit is contained in:
John Marriott
2025-04-15 18:15:24 +02:00
committed by Christian Brabandt
parent d2079cff48
commit 2137710b43
2 changed files with 13 additions and 1 deletions

View File

@ -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)

View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1303,
/**/
1302,
/**/