jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoids the possibility of undefined behavior with memcpy having the same source and destination arrays; this is not every instance of this issue in the source code

This commit is contained in:
Adrian Diaz 2019-05-31 11:53:58 -06:00
parent 3e4fd3dade
commit 76900b8325
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/math_extra.cpp
View File

@ -56,7 +56,7 @@ int mldivide3(const double m[3][3], const double *v, double *ans)
if (fabs(aug[j][i]) > fabs(aug[i][i])) { if (fabs(aug[j][i]) > fabs(aug[i][i])) {
double tempv[4]; double tempv[4];
memcpy(tempv,aug[i],4*sizeof(double)); memcpy(tempv,aug[i],4*sizeof(double));
memcpy(aug[i],aug[j],4*sizeof(double)); memmove(aug[i],aug[j],4*sizeof(double));
memcpy(aug[j],tempv,4*sizeof(double)); memcpy(aug[j],tempv,4*sizeof(double));
} }
} }
@ -68,7 +68,7 @@ int mldivide3(const double m[3][3], const double *v, double *ans)
if (p != i) { if (p != i) {
double tempv[4]; double tempv[4];
memcpy(tempv,aug[i],4*sizeof(double)); memcpy(tempv,aug[i],4*sizeof(double));
memcpy(aug[i],aug[p],4*sizeof(double)); memmove(aug[i],aug[p],4*sizeof(double));
memcpy(aug[p],tempv,4*sizeof(double)); memcpy(aug[p],tempv,4*sizeof(double));
} }

4
src/rcb.cpp
View File

@ -537,7 +537,7 @@ void RCB::compute(int dimension, int n, double **x, double *wt,
if (dotmark[i] == markactive) if (dotmark[i] == markactive)
memcpy(&buf[outgoing++],&dots[i],sizeof(Dot)); memcpy(&buf[outgoing++],&dots[i],sizeof(Dot));
else else
memcpy(&dots[keep++],&dots[i],sizeof(Dot)); memmove(&dots[keep++],&dots[i],sizeof(Dot));
} }
// post receives for dots // post receives for dots
@ -1029,7 +1029,7 @@ void RCB::compute_old(int dimension, int n, double **x, double *wt,
if (dotmark[i] == markactive) if (dotmark[i] == markactive)
memcpy(&buf[outgoing++],&dots[i],sizeof(Dot)); memcpy(&buf[outgoing++],&dots[i],sizeof(Dot));
else else
memcpy(&dots[keep++],&dots[i],sizeof(Dot)); memmove(&dots[keep++],&dots[i],sizeof(Dot));
} }
// post receives for dots // post receives for dots