storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure VLA size is at least one (again)

Browse Source 
This is the same issue as commit 12c7b62a42 and should have been
included there.

'maxcol' can be -1 which results in a size of 0. The array is never
accessed with 'maxcol < 0', but zero length variable length arrays are
undefined behaviour.
This commit is contained in:
Rene Kita
2021-10-04 09:45:33 +02:00
parent b201f426e4
commit e9f5910f1f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
table.c
View File

@@ -1262,7 +1262,8 @@ check_table_width(struct table *t, double *newwidth, MAT * minv, int itr)
int corr = 0;
struct table_cell *cell = &t->cell;
#ifdef __GNUC__
short orgwidth[t->maxcol + 1], corwidth[t->maxcol + 1];
short orgwidth[t->maxcol >= 0 ? t->maxcol + 1 : 1];
short corwidth[t->maxcol >= 0 ? t->maxcol + 1 : 1];
short cwidth[cell->maxcell >= 0 ? cell->maxcell + 1 : 1];
double swidth[cell->maxcell >= 0 ? cell->maxcell + 1 : 1];
#else /* __GNUC__ */
@@ -1615,7 +1616,7 @@ int
get_table_width(struct table *t, short *orgwidth, short *cellwidth, int flag)
{
#ifdef __GNUC__
short newwidth[t->maxcol + 1];
short newwidth[t->maxcol >= 0 ? t->maxcol + 1 : 1];
#else /* not __GNUC__ */
short newwidth[MAXCOL];
#endif /* not __GNUC__ */