ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address integer overflow issues detected by CodeQL

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-12-20 07:04:57 -05:00
parent aba0ead71f
commit 8e36fcfa6a
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/fix_ave_grid.cpp
View File

@ -1524,11 +1524,10 @@ double FixAveGrid::size_grid(GridData * /*grid*/)
double bytes; double bytes;
if (dimension == 2) if (dimension == 2)
bytes = nper * (nxhi_out - nxlo_out + 1) * bytes = sizeof(double) * nper * (nxhi_out - nxlo_out + 1) * (nyhi_out - nylo_out + 1);
(nyhi_out - nylo_out + 1) * sizeof(double);
else else
bytes = nper * (nxhi_out - nxlo_out + 1) * bytes = sizeof(double) * nper * (nxhi_out - nxlo_out + 1) * (nyhi_out - nylo_out + 1) *
(nyhi_out - nylo_out + 1) * (nzhi_out - nzlo_out + 1) * sizeof(double); (nzhi_out - nzlo_out + 1);
return bytes; return bytes;
} }
@ -1544,23 +1543,18 @@ void FixAveGrid::zero_grid(GridData *grid)
if (dimension == 2) { if (dimension == 2) {
if (nvalues == 1) if (nvalues == 1)
memset(&grid->vec2d[nylo_out][nxlo_out],0,ngridout*sizeof(double)); memset(&grid->vec2d[nylo_out][nxlo_out], 0, sizeof(double) * ngridout);
else else
memset(&grid->array2d[nylo_out][nxlo_out][0],0, memset(&grid->array2d[nylo_out][nxlo_out][0], 0, sizeof(double) * ngridout * nvalues);
ngridout*nvalues*sizeof(double)); if (modeatom) memset(&grid->count2d[nylo_out][nxlo_out], 0, sizeof(double) * ngridout);
if (modeatom)
memset(&grid->count2d[nylo_out][nxlo_out],0,ngridout*sizeof(double));
} else { } else {
if (nvalues == 1) if (nvalues == 1)
memset(&grid->vec3d[nzlo_out][nylo_out][nxlo_out],0, memset(&grid->vec3d[nzlo_out][nylo_out][nxlo_out], 0, sizeof(double) * ngridout);
ngridout*sizeof(double));
else else
memset(&grid->array3d[nzlo_out][nylo_out][nxlo_out][0],0, memset(&grid->array3d[nzlo_out][nylo_out][nxlo_out][0], 0, sizeof(double)* ngridout * nvalues);
ngridout*nvalues*sizeof(double));
if (modeatom) if (modeatom)
memset(&grid->count3d[nzlo_out][nylo_out][nxlo_out],0, memset(&grid->count3d[nzlo_out][nylo_out][nxlo_out], 0, sizeof(double) * ngridout);
ngridout*sizeof(double));
} }
} }
@ -2213,9 +2207,9 @@ double FixAveGrid::memory_usage()
bytes += nwindow * size_grid(grid_window[0]); bytes += nwindow * size_grid(grid_window[0]);
if (modeatom) { if (modeatom) {
bytes += maxatom*dimension * sizeof(int); // bin array bytes += sizeof(int) * maxatom * dimension; // bin array
bytes += maxatom * sizeof(int); // skip vector bytes += sizeof(int) * maxatom; // skip vector
bytes += maxvar * sizeof(double); // vresult for per-atom variable bytes += sizeof(double) * maxvar; // vresult for per-atom variable
} }
return bytes; return bytes;

6
src/grid2d.cpp
View File

@ -569,13 +569,13 @@ void Grid2d::extract_comm_info()
xsplit = new double[comm->procgrid[0]+1]; xsplit = new double[comm->procgrid[0]+1];
ysplit = new double[comm->procgrid[1]+1]; ysplit = new double[comm->procgrid[1]+1];
memcpy(xsplit,comm->xsplit,(comm->procgrid[0]+1)*sizeof(double)); memcpy(xsplit, comm->xsplit, sizeof(double) * (comm->procgrid[0]+1));
memcpy(ysplit,comm->ysplit,(comm->procgrid[1]+1)*sizeof(double)); memcpy(ysplit, comm->ysplit, sizeof(double) * (comm->procgrid[1]+1));
memory->create(grid2proc,comm->procgrid[0],comm->procgrid[1],comm->procgrid[2], memory->create(grid2proc,comm->procgrid[0],comm->procgrid[1],comm->procgrid[2],
"grid3d:grid2proc"); "grid3d:grid2proc");
memcpy(&grid2proc[0][0][0],&comm->grid2proc[0][0][0], memcpy(&grid2proc[0][0][0],&comm->grid2proc[0][0][0],
comm->procgrid[0]*comm->procgrid[1]*comm->procgrid[2]*sizeof(int)); sizeof(int) * comm->procgrid[0] * comm->procgrid[1] * comm->procgrid[2]);
} }
// for TILED layout: // for TILED layout:

8
src/grid3d.cpp
View File

@ -632,14 +632,14 @@ void Grid3d::extract_comm_info()
xsplit = new double[comm->procgrid[0]+1]; xsplit = new double[comm->procgrid[0]+1];
ysplit = new double[comm->procgrid[1]+1]; ysplit = new double[comm->procgrid[1]+1];
zsplit = new double[comm->procgrid[2]+1]; zsplit = new double[comm->procgrid[2]+1];
memcpy(xsplit,comm->xsplit,(comm->procgrid[0]+1)*sizeof(double)); memcpy(xsplit, comm->xsplit, sizeof(double) * (comm->procgrid[0]+1));
memcpy(ysplit,comm->ysplit,(comm->procgrid[1]+1)*sizeof(double)); memcpy(ysplit, comm->ysplit, sizeof(double) * (comm->procgrid[1]+1));
memcpy(zsplit,comm->zsplit,(comm->procgrid[2]+1)*sizeof(double)); memcpy(zsplit, comm->zsplit, sizeof(double) * (comm->procgrid[2]+1));
memory->create(grid2proc,comm->procgrid[0],comm->procgrid[1],comm->procgrid[2], memory->create(grid2proc,comm->procgrid[0],comm->procgrid[1],comm->procgrid[2],
"grid3d:grid2proc"); "grid3d:grid2proc");
memcpy(&grid2proc[0][0][0],&comm->grid2proc[0][0][0], memcpy(&grid2proc[0][0][0],&comm->grid2proc[0][0][0],
comm->procgrid[0]*comm->procgrid[1]*comm->procgrid[2]*sizeof(int)); sizeof(int) * comm->procgrid[0] * comm->procgrid[1] * comm->procgrid[2]);
} }
// for TILED layout: // for TILED layout: