1berry/pawn-compiler
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes memory corruption with multi-dimensional arrays

Browse Source 
static const Test[2][][2] = { { { 9, 8 } },  { { 6, 7 } } };

The above code causes a memory corruption as the compiler does not
correctly calculate the size of the array.

This commit adds code to fix it.
This commit is contained in:
Yashas 2017-02-13 13:00:40 +05:30
parent 687d1ff017
commit 17d392b104
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/compiler/sc1.c
View File

@ -2456,12 +2456,18 @@ static void initials(int ident,int tag,cell *size,int dim[],int numdim,
constvalue lastdim={NULL,"",0,0}; /* sizes of the final dimension */ constvalue lastdim={NULL,"",0,0}; /* sizes of the final dimension */
int skipdim=0; int skipdim=0;
if (dim[numdim-1]!=0) /* check if the user has given the size of all dimensions */
*size=calc_arraysize(dim,numdim,0); /* calc. full size, if known */ for (idx = 0; idx < numdim; idx++)
if (dim[idx] == 0)
break;
/* already reserve space for the indirection tables (for an array with /* already reserve space for the indirection tables (for an array with
* known dimensions) * known dimensions)
* (do not use dumpzero(), as it bypasses the literal queue) * (do not use dumpzero(), as it bypasses the literal queue)
*/ */
if(idx == numdim)
*size=calc_arraysize(dim,numdim,0); /* user has provided the size of all the dimensions, so calculate the size */
else
*size = 0; /* user hasn't given the size for one or more dimensions */
for (tablesize=calc_arraysize(dim,numdim-1,0); tablesize>0; tablesize--) for (tablesize=calc_arraysize(dim,numdim-1,0); tablesize>0; tablesize--)
litadd(0); litadd(0);
/* now initialize the sub-arrays */ /* now initialize the sub-arrays */